File tree Expand file tree Collapse file tree 3 files changed +3
-13
lines changed
Expand file tree Collapse file tree 3 files changed +3
-13
lines changed Original file line number Diff line number Diff line change @@ -128,7 +128,7 @@ jobs:
128128 - name : test
129129 run : cd build && ctest -V
130130
131- # Test EXR 3 and TBB 2021 on MacOS
131+ # Test EXR 3 on MacOS
132132 macos-latest :
133133 if : |
134134 github.event_name != 'workflow_dispatch' ||
Original file line number Diff line number Diff line change @@ -12,6 +12,7 @@ brew install glfw
1212brew install googletest
1313brew install c-blosc
1414brew install jq # for trivial parsing of brew json
15+ brew install tbb
1516
1617# Alias python version installed by pybind11 to path
1718py_version=$( brew info pybind11 --json | \
@@ -26,19 +27,13 @@ echo "/usr/local/opt/gnu-getopt/bin" >> $GITHUB_PATH
2627
2728LATEST=$1
2829if [ " $LATEST " == " latest" ]; then
29- brew install tbb
3030 brew install openexr
3131else
3232 brew install ilmbase
33- brew install tbb@2020
3433 brew install openexr@2
3534
3635 # Export OpenEXR paths which are no longer installed to /usr/local (as v2.x is deprecated)
3736 echo " IlmBase_ROOT=/usr/local/opt/ilmbase" >> $GITHUB_ENV
3837 echo " OpenEXR_ROOT=/usr/local/opt/openexr@2" >> $GITHUB_ENV
3938 echo " /usr/local/opt/openexr@2/bin" >> $GITHUB_PATH
40-
41- # Export TBB paths which are no longer installed to /usr/local (as v2020 is deprecated)
42- echo " TBB_ROOT=/usr/local/opt/tbb@2020" >> $GITHUB_ENV
43- echo " /usr/local/opt/tbb@2020/bin" >> $GITHUB_PATH
4439fi
Original file line number Diff line number Diff line change @@ -11,6 +11,7 @@ brew install cppunit
1111brew install c-blosc
1212brew install zlib
1313brew install jq # for trivial parsing of brew json
14+ brew install tbb
1415
1516# Alias python version installed by pybind11 to path
1617py_version=$( brew info pybind11 --json | \
@@ -25,13 +26,7 @@ echo "/usr/local/opt/gnu-getopt/bin" >> $GITHUB_PATH
2526
2627LLVM_VERSION=$1
2728if [ " $LLVM_VERSION " == " latest" ]; then
28- brew install tbb
2929 brew install llvm
3030else
31- brew install tbb@2020
3231 brew install llvm@$LLVM_VERSION
33-
34- # Export TBB paths which are no longer installed to /usr/local (as v2020 is deprecated)
35- echo " TBB_ROOT=/usr/local/opt/tbb@2020" >> $GITHUB_ENV
36- echo " /usr/local/opt/tbb@2020/bin" >> $GITHUB_PATH
3732fi
You can’t perform that action at this time.
0 commit comments