Skip to content

Commit a8b9eb5

Browse files
committed
Removed macos tests with tbb 2020 which has been disabled in homebrew
Signed-off-by: Nick Avramoussis <4256455+Idclip@users.noreply.github.com>
1 parent e711ff7 commit a8b9eb5

File tree

3 files changed

+3
-13
lines changed

3 files changed

+3
-13
lines changed

.github/workflows/weekly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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' ||

ci/install_macos.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ brew install glfw
1212
brew install googletest
1313
brew install c-blosc
1414
brew install jq # for trivial parsing of brew json
15+
brew install tbb
1516

1617
# Alias python version installed by pybind11 to path
1718
py_version=$(brew info pybind11 --json | \
@@ -26,19 +27,13 @@ echo "/usr/local/opt/gnu-getopt/bin" >> $GITHUB_PATH
2627

2728
LATEST=$1
2829
if [ "$LATEST" == "latest" ]; then
29-
brew install tbb
3030
brew install openexr
3131
else
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
4439
fi

ci/install_macos_ax.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ brew install cppunit
1111
brew install c-blosc
1212
brew install zlib
1313
brew install jq # for trivial parsing of brew json
14+
brew install tbb
1415

1516
# Alias python version installed by pybind11 to path
1617
py_version=$(brew info pybind11 --json | \
@@ -25,13 +26,7 @@ echo "/usr/local/opt/gnu-getopt/bin" >> $GITHUB_PATH
2526

2627
LLVM_VERSION=$1
2728
if [ "$LLVM_VERSION" == "latest" ]; then
28-
brew install tbb
2929
brew install llvm
3030
else
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
3732
fi

0 commit comments

Comments
 (0)