Skip to content

Commit 23790e6

Browse files
committed
GHA: Update for homebrew changes on OSX
1 parent 48f833f commit 23790e6

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

.github/workflows/unit-tests.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,13 +162,16 @@ jobs:
162162
- name: Install system packages
163163
run: |
164164
if [[ "${{runner.os}}" =~ macOS ]]; then
165-
brew install cmake boost sdl2 sdl2_mixer gettext miniupnpc libiconv lua
166-
echo /usr/local/opt/gettext/bin >> $GITHUB_PATH
167-
echo "Available Boost installs: $(ls /usr/local/Cellar/boost/)"
165+
env | grep -iF CMAKE_
166+
echo "HOMEBREW_PREFIX=$HOMEBREW_PREFIX"
167+
echo "HOMEBREW_CELLAR=$HOMEBREW_CELLAR"
168+
brew install cmake boost sdl2 sdl2_mixer gettext miniupnpc lua
169+
echo "Homebrew software: $(ls "$HOMEBREW_PREFIX"/* "$HOMEBREW_PREFIX"/include/*)"
170+
echo "Available Boost installs: $(ls "$HOMEBREW_CELLAR/boost/")"
168171
# Use the latest (last folder)
169-
BOOST_ROOT=$(find /usr/local/Cellar/boost/* -maxdepth 0 -type d | tail -n1)
170-
[[ -n "$BOOST_ROOT" ]]
172+
BOOST_ROOT=$(find "$HOMEBREW_CELLAR/boost/"* -maxdepth 0 -type d | tail -n1)
171173
echo "Choosen Boost: $BOOST_ROOT"
174+
[[ -n "$BOOST_ROOT" ]] || exit 1
172175
echo "BOOST_ROOT=${BOOST_ROOT}" >> $GITHUB_ENV
173176
else
174177
compiler=${{matrix.compiler}}

0 commit comments

Comments
 (0)