diff options
| author | Brad King <brad.king@kitware.com> | 2022-04-05 21:45:49 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-04-05 17:46:01 -0400 |
| commit | f38fbdb65b1dddcccef725e6c5e881029f809ff7 (patch) | |
| tree | 826ef7b35038aa6b2cad234d3159a2ebaf89f38f /.gitlab | |
| parent | 441860499ccbab98cb188fb927ae7fb4d1804b6d (diff) | |
| parent | 2808281730b2c887da1845f86042566991be5a8a (diff) | |
| download | cmake-f38fbdb65b1dddcccef725e6c5e881029f809ff7.tar.gz | |
Merge topic 'ci-cmake.org-help' into release-3.23
2808281730 gitlab-ci: update cmake.org documentation in release package pipeline
ed00a29cce gitlab-ci: consolidate jobs for cmake.org/cmake/help/git-{master,stage} docs
5c2e8ce515 Utilities/Sphinx: Add OpenSearch link to html page headers on cmake.org
a14905d4df Utilities/Sphinx: Add option to build outdated version banner for cmake.org
cca73b54ae Utilities/Sphinx: Add undocumented option to build docs for cmake.org
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7144
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 ddcd0d3889..f1c1d54e50 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -512,5 +512,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 5642c1595c..bc51d775bc 100644 --- a/.gitlab/rules.yml +++ b/.gitlab/rules.yml @@ -72,14 +72,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 |