From 30b1080c69ea472b56aab866665493d4c8cc80d7 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 16 Aug 2023 12:13:13 -0400 Subject: Utilities/Release: Remove unused documentation build settings Since commit 37e015d4a6 (Utilities/Sphinx: Refactor Sphinx reference recording, 2023-03-08, v3.27.0-rc1~342^2~1) our documentation requires Python 3.7 or higher. This is not available in the base images we use to build Linux release binaries. These days our release packaging CI pipeline builds the documentation in a separate job anyway. --- .gitlab/os-linux.yml | 3 +-- Utilities/Release/linux/aarch64/cache.txt | 7 ------- Utilities/Release/linux/x86_64/cache.txt | 7 ------- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 23ec481..451a8e2 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -509,8 +509,7 @@ - source .gitlab/ci/env.sh # Bootstrap. - mkdir -p build/ - # Exclude documentation. A job dependency provides it for packaging. - - sed '/^# Build doc/,/^$/d' Utilities/Release/linux/$CMAKE_ARCH/cache.txt > build/CMakeCache.txt + - cp Utilities/Release/linux/$CMAKE_ARCH/cache.txt build/CMakeCache.txt # Make sccache available. - .gitlab/ci/sccache.sh - export PATH=$PWD/.gitlab:$PATH diff --git a/Utilities/Release/linux/aarch64/cache.txt b/Utilities/Release/linux/aarch64/cache.txt index 70739d4..9b13440 100644 --- a/Utilities/Release/linux/aarch64/cache.txt +++ b/Utilities/Release/linux/aarch64/cache.txt @@ -24,13 +24,6 @@ CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:STRING=3 CMAKE_PREFIX_PATH:STRING=/opt/qt CMake_QT_STATIC_QXcbIntegrationPlugin_LIBRARIES:STRING=/opt/qt/plugins/platforms/libqxcb.a;/opt/qt/lib/libQt5XcbQpa.a;/opt/qt/lib/libQt5ServiceSupport.a;/opt/qt/lib/libQt5EdidSupport.a;/opt/qt/lib/libQt5EventDispatcherSupport.a;/opt/qt/lib/libQt5FontDatabaseSupport.a;/opt/qt/lib/libQt5ThemeSupport.a;/opt/qt/lib/libxcb-static.a;-lxcb;-lfontconfig;-lfreetype -# Build documentation. -SPHINX_EXECUTABLE:FILEPATH=/usr/local/bin/sphinx-build -SPHINX_HTML:BOOL=ON -SPHINX_MAN:BOOL=ON -SPHINX_QTHELP:BOOL=ON -QHELPGENERATOR_EXECUTABLE:PATH=/opt/qt/bin/qhelpgenerator - # We bootstrap as part of the build so skip its test. CMake_TEST_BOOTSTRAP:BOOL=FALSE diff --git a/Utilities/Release/linux/x86_64/cache.txt b/Utilities/Release/linux/x86_64/cache.txt index 0b9696b..a40f8fb 100644 --- a/Utilities/Release/linux/x86_64/cache.txt +++ b/Utilities/Release/linux/x86_64/cache.txt @@ -24,13 +24,6 @@ CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:STRING=3 CMAKE_PREFIX_PATH:STRING=/opt/qt CMake_QT_STATIC_QXcbIntegrationPlugin_LIBRARIES:STRING=/opt/qt/plugins/platforms/libqxcb.a;/opt/qt/lib/libQt5XcbQpa.a;/opt/qt/lib/libQt5ServiceSupport.a;/opt/qt/lib/libQt5EdidSupport.a;/opt/qt/lib/libQt5EventDispatcherSupport.a;/opt/qt/lib/libQt5FontDatabaseSupport.a;/opt/qt/lib/libQt5ThemeSupport.a;/opt/qt/lib/libxcb-static.a;-lxcb;-lfontconfig;-lfreetype -# Build documentation. -SPHINX_EXECUTABLE:FILEPATH=/opt/rh/rh-python36/root/usr/bin/sphinx-build -SPHINX_HTML:BOOL=ON -SPHINX_MAN:BOOL=ON -SPHINX_QTHELP:BOOL=ON -QHELPGENERATOR_EXECUTABLE:PATH=/opt/qt/bin/qhelpgenerator - # We bootstrap as part of the build so skip its test. CMake_TEST_BOOTSTRAP:BOOL=FALSE -- cgit v0.12