diff options
| -rw-r--r-- | .gitlab-ci.yml | 29 | ||||
| -rw-r--r-- | .gitlab/ci/configure_fedora31_sphinx.cmake | 8 | ||||
| -rw-r--r-- | .gitlab/ci/gitlab_ci.cmake | 3 |
3 files changed, 39 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9a91d20c4d..2ac075a93b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ - tags@cmake/cmake .fedora31: &fedora31 - image: "kitware/cmake:ci-fedora31-x86_64-2020-04-27" + image: "kitware/cmake:ci-fedora31-x86_64-2020-05-05" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/gitlab-kitware-cmake ci" @@ -29,6 +29,14 @@ CMAKE_CONFIGURATION: fedora31_tidy CTEST_NO_WARNINGS_ALLOWED: 1 +.fedora31_sphinx: &fedora31_sphinx + extends: .fedora31 + + variables: + CMAKE_CONFIGURATION: fedora31_sphinx + CTEST_NO_WARNINGS_ALLOWED: 1 + CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx" + before_script: - .gitlab/ci/cmake.sh - .gitlab/ci/ninja.sh @@ -95,3 +103,22 @@ build:fedora31-tidy: - "$LAUNCHER ctest -VV -S .gitlab/ci/ctest_build.cmake" - sccache --show-stats interruptible: true + +build:fedora31-sphinx: + <<: + - *fedora31_sphinx + stage: build + only: *only_settings + tags: + - build + - docker + - linux + + script: + - .gitlab/ci/sccache.sh + - sccache --start-server + - sccache --show-stats + - "$LAUNCHER ctest -VV -S .gitlab/ci/ctest_configure.cmake" + - "$LAUNCHER ctest -VV -S .gitlab/ci/ctest_build.cmake" + - sccache --show-stats + interruptible: true diff --git a/.gitlab/ci/configure_fedora31_sphinx.cmake b/.gitlab/ci/configure_fedora31_sphinx.cmake new file mode 100644 index 0000000000..dfc9b8cf49 --- /dev/null +++ b/.gitlab/ci/configure_fedora31_sphinx.cmake @@ -0,0 +1,8 @@ +set(SPHINX_INFO ON CACHE BOOL "") +set(SPHINX_MAN ON CACHE BOOL "") +set(SPHINX_HTML ON CACHE BOOL "") +set(SPHINX_SINGLEHTML ON CACHE BOOL "") +set(SPHINX_QTHELP ON CACHE BOOL "") +set(SPHINX_TEXT ON CACHE BOOL "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") diff --git a/.gitlab/ci/gitlab_ci.cmake b/.gitlab/ci/gitlab_ci.cmake index 401cc40eac..b49f51d11c 100644 --- a/.gitlab/ci/gitlab_ci.cmake +++ b/.gitlab/ci/gitlab_ci.cmake @@ -5,6 +5,9 @@ endif () # Set up the source and build paths. set(CTEST_SOURCE_DIRECTORY "$ENV{CI_PROJECT_DIR}") +if (NOT "$ENV{CTEST_SOURCE_SUBDIRECTORY}" STREQUAL "") + string(APPEND CTEST_SOURCE_DIRECTORY "/$ENV{CTEST_SOURCE_SUBDIRECTORY}") +endif () set(CTEST_BINARY_DIRECTORY "${CTEST_SOURCE_DIRECTORY}/build") if ("$ENV{CMAKE_CONFIGURATION}" STREQUAL "") |