Skip to content

Commit a742160

Browse files
authored
ci: for docs workflow, lock down versions and speed up (#4646)
When test building the docs, lock down breathe and furo versions to exactly what we use on RTD. Also, to speed up the workflow: run on native Ubuntu rather than on an ASWF container (eliminates needless container download), and make sure that we don't waste time installing dependencies that we don't need. These changes speed up the docs workflow from around 3:40 to around 2:00. Signed-off-by: Larry Gritz <lg@larrygritz.com>
1 parent 89e5c7f commit a742160

File tree

3 files changed

+11
-16
lines changed

3 files changed

+11
-16
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,7 @@ jobs:
385385
LLVM_VERSION=17.0.6 LLVM_DISTRO_NAME=ubuntu-22.04
386386
SKIP_SYSTEM_DEPS_INSTALL=1 QT_VERSION=0
387387
OpenImageIO_OPTIONAL_DEPS=ALL
388+
EXTRA_DEP_PACKAGES="git cmake ninja-build g++"
388389

389390
- desc: latest releases gcc13 C++20 py3.12 avx2 exr3.3 ocio2.4
390391
nametag: linux-latest-releases

.github/workflows/docs.yml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,6 @@ jobs:
5656
build_type: ${{ matrix.build_type || 'Release' }}
5757
depcmds: ${{ matrix.depcmds }}
5858
extra_artifacts: ${{ matrix.extra_artifacts }}
59-
fmt_ver: ${{ matrix.fmt_ver }}
60-
opencolorio_ver: ${{ matrix.opencolorio_ver }}
61-
openexr_ver: ${{ matrix.openexr_ver }}
62-
pybind11_ver: ${{ matrix.pybind11_ver }}
6359
python_ver: ${{ matrix.python_ver }}
6460
setenvs: ${{ matrix.setenvs }}
6561
simd: ${{ matrix.simd }}
@@ -68,10 +64,6 @@ jobs:
6864
abi_check: ${{ matrix.abi_check }}
6965
build_docs: ${{ matrix.build_docs }}
7066
generator: ${{ matrix.generator }}
71-
ctest_args: ${{ matrix.ctest_args }}
72-
ctest_test_timeout: ${{ matrix.ctest_test_timeout }}
73-
coverage: ${{ matrix.coverage || '0' }}
74-
sonar: ${{ matrix.sonar || '0' }}
7567

7668
strategy:
7769
fail-fast: false
@@ -80,12 +72,13 @@ jobs:
8072
- desc: docs
8173
nametag: docslinux
8274
runner: ubuntu-latest
83-
container: aswftesting/ci-openexr:2024
84-
vfxyear: 2024
8575
cxx_std: 17
8676
python_ver: "3.11"
8777
build_docs: 1
8878
skip_build: 1
8979
skip_tests: 1
9080
setenvs: export EXTRA_DEP_PACKAGES="doxygen sphinx-doc"
91-
PIP_INSTALLS="sphinx breathe sphinx-tabs furo"
81+
PIP_INSTALLS="sphinx breathe==4.34.0 sphinx-tabs furo==2022.6.21"
82+
SKIP_SYSTEM_DEPS_INSTALL=1
83+
USE_OPENCV=0 USE_FFMPEG=0 USE_FREETYPE=0
84+
USE_LIBHEIF=0 QT_VERSION=0 PYBIND11_VERSION=0

src/build-scripts/gh-installdeps.bash

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,11 @@ else
8686
time sudo apt-get update
8787
fi
8888

89-
time sudo apt-get -q install -y \
90-
git cmake ninja-build ccache g++ \
91-
libilmbase-dev libopenexr-dev \
92-
libtiff-dev libgif-dev libpng-dev
9389
if [[ "${SKIP_SYSTEM_DEPS_INSTALL}" != "1" ]] ; then
9490
time sudo apt-get -q install -y --fix-missing \
91+
git cmake ninja-build ccache g++ \
92+
libilmbase-dev libopenexr-dev \
93+
libtiff-dev libgif-dev libpng-dev \
9594
libraw-dev libwebp-dev \
9695
libavcodec-dev libavformat-dev libswscale-dev libavutil-dev \
9796
dcmtk libopenvdb-dev \
@@ -158,7 +157,9 @@ fi
158157
# Packages we need to build from scratch.
159158
#
160159

161-
source src/build-scripts/build_pybind11.bash
160+
if [[ "$PYBIND11_VERSION" != "0" ]] ; then
161+
source src/build-scripts/build_pybind11.bash
162+
fi
162163

163164
if [[ "$OPENEXR_VERSION" != "" ]] ; then
164165
source src/build-scripts/build_openexr.bash

0 commit comments

Comments
 (0)