gitlab-ci: consolidate jobs for cmake.org/cmake/help/git-{master,stage} docs

.gitlab-ci.yml

@@ -70,37 +70,19 @@ u:source-package:
 
 # Documentation builds
 
-b:help:master:
+b:cmake.org-help:
     extends:
         - .cmake_org_help
-        - .run_only_for_continuous_master
+        - .run_cmake_org_help
 
-.u:help:master:
+u:cmake.org-help:
     extends:
         - .rsync_upload_help
-        - .run_only_for_continuous_master
+        - .run_cmake_org_help
-    variables:
-        RSYNC_DESTINATION: git-master
     dependencies:
-        - b:help:master
+        - b:cmake.org-help
     needs:
-        - b:help:master
+        - b:cmake.org-help
-
-b:help:stage:
-    extends:
-        - .cmake_org_help
-        - .run_only_for_continuous_stage
-
-.u:help:stage:
-    extends:
-        - .rsync_upload_help
-        - .run_only_for_continuous_stage
-    variables:
-        RSYNC_DESTINATION: git-stage
-    dependencies:
-        - b:help:stage
-    needs:
-        - b:help:stage
 
 # Lint builds
 

.gitlab/rules.yml

@@ -72,14 +72,14 @@
           when: on_success
         - when: never
 
-.run_only_for_continuous_master:
+.run_cmake_org_help:
     rules:
         - if: '$CMAKE_CI_PROJECT_MAIN_BRANCH != null && $CI_COMMIT_BRANCH != null && $CMAKE_CI_PROJECT_MAIN_BRANCH == $CI_COMMIT_BRANCH'
+          variables:
+              RSYNC_DESTINATION: "git-master"
           when: on_success
-        - when: never
-
-.run_only_for_continuous_stage:
-    rules:
         - if: '$CMAKE_CI_PROJECT_CONTINUOUS_BRANCH != null && $CI_COMMIT_BRANCH != null && $CMAKE_CI_PROJECT_CONTINUOUS_BRANCH == $CI_COMMIT_BRANCH'
+          variables:
+              RSYNC_DESTINATION: "git-stage"
           when: on_success
         - when: never