From 2362523726b0ad5360b645fba47653c003243b73 Mon Sep 17 00:00:00 2001 From: Larry Gritz Date: Sat, 22 Jun 2024 22:24:41 -0700 Subject: [PATCH] ci: Mods to CI to deal with OIIO master raising dependency mins (#1833) Signed-off-by: Larry Gritz --- .github/workflows/ci.yml | 4 ++-- src/build-scripts/ci-startup.bash | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3fb26aefd..0ff552ad3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -104,7 +104,7 @@ jobs: cxx_std: 17 openimageio_ver: master python_ver: 3.9 - pybind11_ver: v2.6.2 + pybind11_ver: v2.7.0 simd: avx2,f16c batched: b8_AVX2,b8_AVX512,b16_AVX512 setenvs: USE_OPENVDB=0 @@ -180,7 +180,7 @@ jobs: openexr_ver: v2.4.3 openimageio_ver: v2.4.13.0 python_ver: 2.7 - pybind11_ver: v2.6.2 + pybind11_ver: v2.7.0 simd: 0 setenvs: export PUGIXML_VERSION=v1.8 CMAKE_VERSION=3.15.5 diff --git a/src/build-scripts/ci-startup.bash b/src/build-scripts/ci-startup.bash index 407dc0db8..a3d7b7d64 100755 --- a/src/build-scripts/ci-startup.bash +++ b/src/build-scripts/ci-startup.bash @@ -47,6 +47,9 @@ export DYLD_LIBRARY_PATH=${LOCAL_DEPS_DIR}/dist/lib:$DYLD_LIBRARY_PATH export TESTSUITE_CLEANUP_ON_SUCCESS=${TESTSUITE_CLEANUP_ON_SUCCESS:=1} +# For CI, default to building missing dependencies automatically +export OpenImageIO_BUILD_MISSING_DEPS=${OpenImageIO_BUILD_MISSING_DEPS:=all} + # Parallel builds if [[ `uname -s` == "Linux" ]] ; then echo "procs: " `nproc`