diff options
| -rw-r--r-- | .gitlab-ci.yml | 30 | ||||
| -rw-r--r-- | .gitlab/rules.yml | 10 |
2 files changed, 11 insertions, 29 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d5529df..0585579 100644 --- a/.gitlab-ci.yml +++ b/.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 - variables: - RSYNC_DESTINATION: git-master - dependencies: - - b:help:master - needs: - - b:help:master - -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 + - .run_cmake_org_help dependencies: - - b:help:stage + - b:cmake.org-help needs: - - b:help:stage + - b:cmake.org-help # Lint builds diff --git a/.gitlab/rules.yml b/.gitlab/rules.yml index 5642c15..def89a0 100644 --- a/.gitlab/rules.yml +++ b/.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 |