diff options
| author | Brad King <brad.king@kitware.com> | 2022-04-05 20:51:04 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-04-05 20:51:04 (GMT) |
| commit | 2ce668b11d43fdac36b0a4b28f06b2a235e5a04b (patch) | |
| tree | 1a603a560598c0b98763f56882a2e62935141ce6 /.gitlab | |
| parent | 2f7b1dd72c3dfc184f16a7b6c8fba47f8ab5135b (diff) | |
| parent | 2808281730b2c887da1845f86042566991be5a8a (diff) | |
| download | CMake-2ce668b11d43fdac36b0a4b28f06b2a235e5a04b.zip CMake-2ce668b11d43fdac36b0a4b28f06b2a235e5a04b.tar.gz CMake-2ce668b11d43fdac36b0a4b28f06b2a235e5a04b.tar.bz2 | |
Merge branch 'backport-ci-cmake.org-help' into ci-cmake.org-help
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/os-linux.yml | 5 | ||||
| -rw-r--r-- | .gitlab/rules.yml | 17 |
2 files changed, 16 insertions, 6 deletions
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 4f0fda4..1a13c3a 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -539,5 +539,8 @@ - *before_script_linux - mkdir -p build/ - cd build/ - - cmake ../Utilities/Sphinx -GNinja -DSPHINX_HTML=ON -DSPHINX_FLAGS="-A versionswitch=1" + - 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 fd7948e..d5f8795 100644 --- a/.gitlab/rules.yml +++ b/.gitlab/rules.yml @@ -74,14 +74,21 @@ when: on_success - when: never -.run_only_for_continuous_master: +.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 - - 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" + CMAKE_CI_VERSION_NO_GIT: "OFF" when: on_success - when: never |