Merge pull request #1070 from Idclip/macos_ci_fix

macos TBB CI fixes

Author: danrbailey

.github/workflows/ax.yml

@@ -122,8 +122,7 @@ jobs:
       - name: build
         run: |
           ./ci/build.sh ${{ matrix.build }} None ON None "core,axcore,axbin,axtest" \
-            -DLLVM_DIR=/usr/local/opt/llvm@${{ matrix.llvm }}/lib/cmake/llvm \
-            -DOPENVDB_ROOT=$HOME/openvdb-7.0.0-${{ matrix.compiler }}
+            -DLLVM_DIR=/usr/local/opt/llvm@${{ matrix.llvm }}/lib/cmake/llvm
       # Tests
       - name: test
         run: cd build && ctest -V

ci/install_macos.sh

@@ -10,7 +10,7 @@ brew install openexr@2
 brew install boost
 brew install boost-python3 # also installs the dependent python version
 brew install gtest
-brew install tbb
+brew install tbb@2020
 brew install zlib
 brew install glfw
 brew install jq # for trivial parsing of brew json
@@ -23,7 +23,11 @@ echo "Using python $py_version"
 echo "Python_ROOT_DIR=/usr/local/opt/$py_version" >> $GITHUB_ENV
 echo "/usr/local/opt/$py_version/bin" >> $GITHUB_PATH
 
-# Export OpenEXR paths which is no longer installed to /usr/local (as v2.x is deprecated)
+# Export OpenEXR paths which are no longer installed to /usr/local (as v2.x is deprecated)
 echo "IlmBase_ROOT=/usr/local/opt/ilmbase" >> $GITHUB_ENV
 echo "OpenEXR_ROOT=/usr/local/opt/openexr@2" >> $GITHUB_ENV
 echo "/usr/local/opt/openexr@2/bin" >> $GITHUB_PATH
+
+# Export TBB paths which are no longer installed to /usr/local (as v2020 is deprecated)
+echo "TBB_ROOT=/usr/local/opt/tbb@2020" >> $GITHUB_ENV
+echo "/usr/local/opt/tbb@2020/bin" >> $GITHUB_PATH

ci/install_macos_ax.sh

@@ -10,12 +10,14 @@ fi
 
 brew update
 brew install bash
-brew install ilmbase
-brew install openexr
 brew install cmake
 brew install boost
 brew install cppunit
 brew install c-blosc
-brew install tbb
+brew install tbb@2020
 brew install llvm@$LLVM_VERSION
 brew install zlib
+
+# Export TBB paths which are no longer installed to /usr/local (as v2020 is deprecated)
+echo "TBB_ROOT=/usr/local/opt/tbb@2020" >> $GITHUB_ENV
+echo "/usr/local/opt/tbb@2020/bin" >> $GITHUB_PATH