diff options
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab/os-linux.yml | 1 | ||||
| -rw-r--r-- | .gitlab/rules.yml | 7 |
3 files changed, 10 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0585579..60b1beb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -74,6 +74,8 @@ b:cmake.org-help: extends: - .cmake_org_help - .run_cmake_org_help + dependencies: [] + needs: [] u:cmake.org-help: extends: diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 4a87b21..3d2c827 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -493,4 +493,5 @@ - cmake ../Utilities/Sphinx -GNinja -DSPHINX_HTML=ON -DCMake_SPHINX_CMAKE_ORG=ON -DCMake_SPHINX_CMAKE_ORG_OUTDATED=$CMAKE_CI_SPHINX_OUTDATED + -DCMake_VERSION_NO_GIT=$CMAKE_CI_VERSION_NO_GIT - ninja diff --git a/.gitlab/rules.yml b/.gitlab/rules.yml index def89a0..bc51d77 100644 --- a/.gitlab/rules.yml +++ b/.gitlab/rules.yml @@ -74,12 +74,19 @@ .run_cmake_org_help: rules: + - if: '$CMAKE_CI_PACKAGE =~ /v[0-9]+\.[0-9]+/' + variables: + RSYNC_DESTINATION: "$CMAKE_CI_PACKAGE" + CMAKE_CI_VERSION_NO_GIT: "ON" + when: manual - if: '$CMAKE_CI_PROJECT_MAIN_BRANCH != null && $CI_COMMIT_BRANCH != null && $CMAKE_CI_PROJECT_MAIN_BRANCH == $CI_COMMIT_BRANCH' variables: RSYNC_DESTINATION: "git-master" + CMAKE_CI_VERSION_NO_GIT: "OFF" when: on_success - if: '$CMAKE_CI_PROJECT_CONTINUOUS_BRANCH != null && $CI_COMMIT_BRANCH != null && $CMAKE_CI_PROJECT_CONTINUOUS_BRANCH == $CI_COMMIT_BRANCH' variables: RSYNC_DESTINATION: "git-stage" + CMAKE_CI_VERSION_NO_GIT: "OFF" when: on_success - when: never |