ci: Fix broken CI from new OIIO that needs newer cmake

Signed-off-by: Larry Gritz <[email protected]>
lgritz · Aug 23, 2023 · e617649 · e617649
1 parent 271f8bc
commit e617649
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -63,13 +63,15 @@ 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
             simd: avx2,f16c
             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
@@ -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