Skip to content

Commit 89df5ea

Browse files
committed
ci: unbreak CI by adjusting Ubuntu installs (#4981)
The default Ubuntu images keep shifing around. Last week, some packages that used to be installed disappeared. Need to adjust what we install in gh-installdeps.bash, and slightly adjust the optional deps in ci.yml to allow some things that seem to be only on some runners to be missing. Also bump the clang test to clang18 on an ubuntu-24 runner (from clang 15 on ubuntu 22). Gets us back to all-passing CI after a week of all sorts of failures in tests that used to work. Signed-off-by: Larry Gritz <[email protected]>
1 parent 7cf0820 commit 89df5ea

File tree

2 files changed

+18
-10
lines changed

2 files changed

+18
-10
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ jobs:
502502
# Ensure we are testing all the deps we think we are. We would
503503
# like this test to have minimal missing dependencies.
504504
required_deps: all
505-
optional_deps: 'CUDAToolkit;DCMTK;JXL;Nuke;OpenCV;OpenGL;OpenVDB;R3DSDK'
505+
optional_deps: 'CUDAToolkit;DCMTK;JXL;libuhdr;Nuke;OpenCV;OpenGL;openjph;R3DSDK;'
506506
- desc: all local builds gcc12 C++17 avx2 exr3.2 ocio2.3
507507
nametag: linux-local-builds
508508
runner: ubuntu-22.04
@@ -517,18 +517,19 @@ jobs:
517517
PTEX_VERSION=v2.4.2
518518
PUGIXML_VERSION=v1.14
519519
WEBP_VERSION=v1.4.0
520-
- desc: clang15 C++17 avx2 exr3.1 ocio2.3
521-
nametag: linux-clang15
522-
runner: ubuntu-22.04
523-
cxx_compiler: clang++-15
524-
cc_compiler: clang-15
520+
- desc: clang18 C++17 avx2 exr3.1 ocio2.3
521+
nametag: linux-clang18
522+
runner: ubuntu-24.04
523+
cxx_compiler: clang++
524+
cc_compiler: clang
525525
cxx_std: 17
526526
fmt_ver: 10.1.1
527527
opencolorio_ver: v2.3.0
528528
openexr_ver: v3.1.13
529529
pybind11_ver: v2.12.0
530-
python_ver: "3.10"
530+
python_ver: "3.12"
531531
simd: avx2,f16c
532+
setenvs: export USE_OPENVDB=0
532533
- desc: Linux ARM latest releases gcc14 C++20 py3.12 exr3.4 ocio2.4
533534
nametag: linux-arm-latest-releases
534535
runner: ubuntu-24.04-arm

src/build-scripts/gh-installdeps.bash

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,17 @@ else
9696
if [[ "${SKIP_SYSTEM_DEPS_INSTALL}" != "1" ]] ; then
9797
time sudo apt-get -q install -y --fix-missing \
9898
git cmake ninja-build ccache g++ \
99-
libilmbase-dev libopenexr-dev \
100-
libtiff-dev libgif-dev libpng-dev \
99+
libtiff-dev libgif-dev libpng-dev libjpeg-dev \
101100
libraw-dev libwebp-dev \
102101
libavcodec-dev libavformat-dev libswscale-dev libavutil-dev \
103102
dcmtk libopenvdb-dev \
104103
libfreetype6-dev \
105104
libopencolorio-dev \
106-
libtbb-dev || true
105+
libtbb-dev \
106+
libdeflate-dev bzip2
107+
# Iffy ones get the "|| true" treatment so failure is ok
108+
time sudo apt-get -q install -y --fix-missing \
109+
libjxl-dev || true
107110
fi
108111
if [[ "${USE_OPENCV}" != "0" ]] && [[ "${INSTALL_OPENCV}" != "0" ]] ; then
109112
sudo apt-get -q install -y --fix-missing libopencv-dev || true
@@ -133,6 +136,10 @@ else
133136
libheif-plugin-x265 libheif-dev || true
134137
fi
135138

139+
if [[ "${USE_FFMPEG}" != "0" ]] ; then
140+
time sudo apt-get -q install -y ffmpeg || true
141+
fi
142+
136143
export CMAKE_PREFIX_PATH=/usr/lib/x86_64-linux-gnu:$CMAKE_PREFIX_PATH
137144

138145
if [[ "$CXX" == "icpc" || "$CC" == "icc" || "$USE_ICC" != "" || "$USE_ICX" != "" ]] ; then

0 commit comments

Comments
 (0)