CI: For Mac, test python 3.9 for MacOS11, and 3.10 for MacOS12 (Acade…

…mySoftwareFoundation#1554) This cleans up some recently-failing CI tests. Signed-off-by: Larry Gritz <[email protected]>
lgritz · Aug 23, 2022 · 475a109 · 475a109
1 parent 91eb432
commit 475a109
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -360,26 +360,29 @@ jobs:
   macos:
     name: "${{matrix.os}} appleclang${{matrix.aclang}}/C++${{matrix.cxx_std}} py${{matrix.python_ver}} ${{matrix.desc}}"
     strategy:
+      fail-fast: false
       matrix:
         include:
-          - desc: llvm11
-            os: macos-10.15
-            nametag: macos10-py39
-            cxx_std: 14
-            python_ver: 3.9
-            aclang: 12
-          - desc: llvm11
+          - desc: MacOS-11
             os: macos-11
             nametag: macos11-py39
             cxx_std: 17
             python_ver: 3.9
             aclang: 13
+            openimageio_ver: release
+          - desc: MacOS-12
+            os: macos-12
+            nametag: macos11-p310
+            cxx_std: 17
+            python_ver: "3.10"
+            aclang: 13
     runs-on: ${{matrix.os}}
     env:
       CC: clang
       CXX: clang++
       CMAKE_CXX_STANDARD: ${{matrix.cxx_std}}
       PYTHON_VERSION: ${{matrix.python_ver}}
+      OPENIMAGEIO_VERSION: ${{matrix.openimageio_ver}}
     steps:
       - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2
       - name: Prepare ccache timestamp
@@ -397,10 +400,14 @@ jobs:
       - name: Dependencies
         run: |
             source src/build-scripts/install_homebrew_deps.bash
-            # OPENIMAGEIO_CMAKE_FLAGS="-DOIIO_BUILD_TESTS=0 -DUSE_OPENGL=0"
-            # source src/build-scripts/build_openimageio.bash
-            brew install --display-times -q openimageio
-            PYTHONPATH=$PYTHONPATH:/usr/local/python${PYTHON_VERSION}/site-packages
+            if [[ "$OPENIMAGEIO_VERSION" != "" ]] ; then \
+                OPENIMAGEIO_CMAKE_FLAGS="-DOIIO_BUILD_TESTS=0 -DUSE_OPENGL=0" ; \
+                source src/build-scripts/build_openimageio.bash ; \
+            else \
+                brew install --display-times -q openimageio ; \
+                PYTHONPATH=$PYTHONPATH:/usr/local/python${PYTHON_VERSION}/site-packages ; \
+            fi
+            src/build-scripts/save-env.bash
       - name: Build
         run: |
             src/build-scripts/ci-build.bash

diff --git a/src/build-scripts/install_homebrew_deps.bash b/src/build-scripts/install_homebrew_deps.bash
@@ -27,9 +27,11 @@ brew list --versions
 
 brew install --display-times -q gcc ccache cmake ninja boost || true
 brew link --overwrite gcc
+brew install --display-times -q python@${PYTHON_VERSION} || true
 brew unlink [email protected] || true
-brew unlink [email protected] || true
 brew unlink [email protected] || true
+brew unlink [email protected] || true
+brew unlink [email protected] || true
 brew link --overwrite --force python@${PYTHON_VERSION} || true
 brew upgrade --display-times -q cmake || true
 brew install --display-times -q ilmbase openexr