From a6041044d6583dcc3a1440da96df90dc80ce4d43 Mon Sep 17 00:00:00 2001 From: Larry Gritz Date: Thu, 3 Sep 2026 16:08:49 -0700 Subject: [PATCH] ci: fix broken CI with recent OIIO change and libtiff vs webp The CI "sanitizer" job builds against OIIO main (and has libtiff 4.0.9 pre-installed -- remember that). After recent changes to OIIO main, libtiff 4.1 is the minimum, so it ends up auto-building for OSL's "sanitizer" job. But we specifically try to disable building webp support, so there is a conflict. Don't force disabling of webp building, that takes care of it on this side. Simultaneously fixing the OIIO build to be smarter about it. Signed-off-by: Larry Gritz --- src/build-scripts/gh-installdeps.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build-scripts/gh-installdeps.bash b/src/build-scripts/gh-installdeps.bash index 807b35265..7ea57c5f7 100755 --- a/src/build-scripts/gh-installdeps.bash +++ b/src/build-scripts/gh-installdeps.bash @@ -204,7 +204,7 @@ if [[ "$OPENIMAGEIO_VERSION" != "" ]] ; then export ENABLE_BMP=0 ENABLE_cineon=0 ENABLE_DDS=0 ENABLE_DPX=0 ENABLE_FITS=0 export ENABLE_ICO=0 ENABLE_iff=0 ENABLE_jpeg2000=0 ENABLE_PNM=0 ENABLE_PSD=0 export ENABLE_RLA=0 ENABLE_SGI=0 ENABLE_SOCKET=0 ENABLE_SOFTIMAGE=0 - export ENABLE_TARGA=0 ENABLE_WEBP=0 ENABLE_jpegxl=0 ENABLE_libuhdr=0 + export ENABLE_TARGA=0 ENABLE_jpegxl=0 ENABLE_libuhdr=0 # We don't need to run OIIO's tests export OPENIMAGEIO_CMAKE_FLAGS+=" -DOIIO_BUILD_TESTING=OFF -DOIIO_BUILD_TESTS=0" # Don't let warnings in OIIO break OSL's CI run