Skip to content

Commit e1aac1d

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

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

.github/workflows/unit-tests.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,13 +162,22 @@ jobs:
162162
- name: Install system packages
163163
run: |
164164
if [[ "${{runner.os}}" =~ macOS ]]; then
165+
echo "HOMEBREW_PREFIX=$HOMEBREW_PREFIX"
166+
echo "HOMEBREW_CELLAR=$HOMEBREW_CELLAR"
165167
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/)"
168+
echo "Homebrew software: $(ls "$HOMEBREW_PREFIX"/* "$HOMEBREW_PREFIX"/include/*)"
169+
echo "Available Boost installs: $(ls "$HOMEBREW_CELLAR/boost/")"
170+
gettext_path=$HOMEBREW_PREFIX/gettext/bin
171+
if [[ -d $gettext_path ]]; then
172+
echo "$gettext_path" >> $GITHUB_PATH
173+
else
174+
echo "Missing $gettext_path"
175+
exit 1
176+
fi
168177
# Use the latest (last folder)
169-
BOOST_ROOT=$(find /usr/local/Cellar/boost/* -maxdepth 0 -type d | tail -n1)
170-
[[ -n "$BOOST_ROOT" ]]
178+
BOOST_ROOT=$(find "$HOMEBREW_CELLAR/boost/"* -maxdepth 0 -type d | tail -n1)
171179
echo "Choosen Boost: $BOOST_ROOT"
180+
[[ -n "$BOOST_ROOT" ]] || exit 1
172181
echo "BOOST_ROOT=${BOOST_ROOT}" >> $GITHUB_ENV
173182
else
174183
compiler=${{matrix.compiler}}

0 commit comments

Comments
 (0)