diff options
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/artifacts.yml | 1 | ||||
| -rw-r--r-- | .gitlab/os-linux.yml | 4 | ||||
| -rw-r--r-- | .gitlab/rules.yml | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/.gitlab/artifacts.yml b/.gitlab/artifacts.yml index 982f50b3bd..5472c0ace9 100644 --- a/.gitlab/artifacts.yml +++ b/.gitlab/artifacts.yml @@ -116,4 +116,3 @@ - build/html exclude: - build/html/.buildinfo - - build/html/objects.inv diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index f1c1d54e50..af540f9588 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -512,7 +512,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 |