summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-04-06 09:25:38 -0400
committerBrad King <brad.king@kitware.com>2022-04-06 09:59:14 -0400
commitb691906d271e2cb3dba09ef8ec07d05278976257 (patch)
tree5e4204c860c9ee78bf7cca44a85da6078d549cca /.gitlab
parent1ceec19c208f0655362ce360a5402f613c393f3c (diff)
downloadcmake-b691906d271e2cb3dba09ef8ec07d05278976257.tar.gz
gitlab-ci: Build qthelp-format release documentation for cmake.org
Previously the qthelp-format release documentation on `cmake.org` was built manually.
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/os-linux.yml4
-rw-r--r--.gitlab/rules.yml3
2 files changed, 6 insertions, 1 deletions
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index 3d2c8272f8..2d7ace62b1 100644
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@@ -490,7 +490,9 @@
- *before_script_linux
- mkdir -p build/
- cd build/
- - cmake ../Utilities/Sphinx -GNinja -DSPHINX_HTML=ON
+ - cmake ../Utilities/Sphinx -GNinja
+ -DSPHINX_HTML=ON
+ -DSPHINX_QTHELP=$CMAKE_CI_SPHINX_QTHELP
-DCMake_SPHINX_CMAKE_ORG=ON
-DCMake_SPHINX_CMAKE_ORG_OUTDATED=$CMAKE_CI_SPHINX_OUTDATED
-DCMake_VERSION_NO_GIT=$CMAKE_CI_VERSION_NO_GIT
diff --git a/.gitlab/rules.yml b/.gitlab/rules.yml
index bc51d775bc..20603f52fd 100644
--- a/.gitlab/rules.yml
+++ b/.gitlab/rules.yml
@@ -77,16 +77,19 @@
- if: '$CMAKE_CI_PACKAGE =~ /v[0-9]+\.[0-9]+/'
variables:
RSYNC_DESTINATION: "$CMAKE_CI_PACKAGE"
+ CMAKE_CI_SPHINX_QTHELP: "ON"
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_SPHINX_QTHELP: "OFF"
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_SPHINX_QTHELP: "OFF"
CMAKE_CI_VERSION_NO_GIT: "OFF"
when: on_success
- when: never