GHA: Update for homebrew changes on OSX

Return-To-The-Roots · Jan 2, 2025 · e1aac1d · e1aac1d
1 parent 48f833f
commit e1aac1d
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -162,13 +162,22 @@ jobs:
       - name: Install system packages
         run: |
           if [[ "${{runner.os}}" =~ macOS ]]; then
+            echo "HOMEBREW_PREFIX=$HOMEBREW_PREFIX"
+            echo "HOMEBREW_CELLAR=$HOMEBREW_CELLAR"
             brew install cmake boost sdl2 sdl2_mixer gettext miniupnpc libiconv lua
-            echo /usr/local/opt/gettext/bin >> $GITHUB_PATH
-            echo "Available Boost installs: $(ls /usr/local/Cellar/boost/)"
+            echo "Homebrew software: $(ls "$HOMEBREW_PREFIX"/* "$HOMEBREW_PREFIX"/include/*)"
+            echo "Available Boost installs: $(ls "$HOMEBREW_CELLAR/boost/")"
+            gettext_path=$HOMEBREW_PREFIX/gettext/bin
+            if [[ -d $gettext_path ]]; then
+              echo "$gettext_path" >> $GITHUB_PATH
+            else
+              echo "Missing $gettext_path"
+              exit 1
+            fi
             # Use the latest (last folder)
-            BOOST_ROOT=$(find /usr/local/Cellar/boost/* -maxdepth 0 -type d | tail -n1)
-            [[ -n "$BOOST_ROOT" ]]
+            BOOST_ROOT=$(find "$HOMEBREW_CELLAR/boost/"* -maxdepth 0 -type d | tail -n1)
             echo "Choosen Boost: $BOOST_ROOT"
+            [[ -n "$BOOST_ROOT" ]] || exit 1
             echo "BOOST_ROOT=${BOOST_ROOT}" >> $GITHUB_ENV
           else
             compiler=${{matrix.compiler}}