Merge branch 'backport-ci-cmake.org-help' into ci-cmake.org-help

This commit is contained in:
Brad King
2022-04-05 16:51:04 -04:00
7 changed files with 109 additions and 36 deletions
+4 -1
View File
@@ -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
+12 -5
View File
@@ -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