From e6176495ff2af4aa3bb795c1cade4c5b361860fd Mon Sep 17 00:00:00 2001 From: Larry Gritz Date: Tue, 22 Aug 2023 19:50:02 -0700 Subject: [PATCH] ci: Fix broken CI from new OIIO that needs newer cmake Signed-off-by: Larry Gritz --- .github/workflows/ci.yml | 2 ++ src/build-scripts/gh-installdeps.bash | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 68704cf210..590a70b16d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -63,6 +63,7 @@ jobs: container: aswftesting/ci-osl:2019-clang10 vfxyear: 2019 cxx_std: 14 + openexr_ver: v3.1.10 openimageio_ver: master python_ver: 2.7 # pybind11_ver: v2.9.0 @@ -70,6 +71,7 @@ jobs: skip_tests: 1 setenvs: export OSL_CMAKE_FLAGS="-DUSE_OPTIX=1" OPTIX_VERSION=7.0 OPENIMAGEIO_CMAKE_FLAGS=-DBUILD_FMT_VERSION=8.1.1 + CMAKE_VERSION=3.15.5 - desc: gcc6/C++14 llvm10 py3.7 boost1.70 exr2.4 oiio2.2 sse4 nametag: linux-vfx2020 os: ubuntu-latest diff --git a/src/build-scripts/gh-installdeps.bash b/src/build-scripts/gh-installdeps.bash index d2c6b41602..3fda71c995 100755 --- a/src/build-scripts/gh-installdeps.bash +++ b/src/build-scripts/gh-installdeps.bash @@ -147,6 +147,12 @@ if [[ "$OPTIX_VERSION" != "" ]] ; then fi +if [[ "$CMAKE_VERSION" != "" ]] ; then + source src/build-scripts/build_cmake.bash +fi +cmake --version + + source src/build-scripts/build_pybind11.bash if [[ "$OPENEXR_VERSION" != "" ]] ; then