summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-03-12 18:27:02 (GMT)
committerKitware Robot <kwrobot@kitware.com>2021-03-12 18:27:09 (GMT)
commitc141a8be9ea21a22e2bd57ce8d09354dfe87a27b (patch)
treee5db647e823c868960c22429edbf7ef6dcbec775
parentc69d4b177fb3f6ebd22cddec919dbe1c30f43714 (diff)
parent9b5eae9cdebd0cdb9be13c9c7740eaa0a883024b (diff)
downloadCMake-c141a8be9ea21a22e2bd57ce8d09354dfe87a27b.zip
CMake-c141a8be9ea21a22e2bd57ce8d09354dfe87a27b.tar.gz
CMake-c141a8be9ea21a22e2bd57ce8d09354dfe87a27b.tar.bz2
Merge topic 'ci-build-no-doc' into release-3.20
9b5eae9cde gitlab-ci: remove redundant sphinx build from release-style CI jobs Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !5905
-rw-r--r--.gitlab/os-linux.yml3
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index e36d97d..e40760e 100644
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@@ -253,7 +253,8 @@
script:
# Bootstrap.
- mkdir -p build/
- - cp -v Utilities/Release/linux/$CMAKE_ARCH/cache.txt build/CMakeCache.txt
+ # Exclude documentation. A job dependency provides it for packaging.
+ - sed '/^# Build doc/,/^$/d' Utilities/Release/linux/$CMAKE_ARCH/cache.txt > build/CMakeCache.txt
# Make sccache available.
- .gitlab/ci/sccache.sh
- export PATH=$PWD/.gitlab:$PATH