diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2024-04-24 09:15:02 -0700 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2024-04-25 16:07:17 -0400 |
| commit | 274445d247afd44afc408af5a8d130ae9a7c270c (patch) | |
| tree | a45651247263b85fbab41afaa096b5ab2e3bbbae | |
| parent | 869bb7bc423db0bd176eab6d0c8662bfe7be74bf (diff) | |
| download | meson-274445d247afd44afc408af5a8d130ae9a7c270c.zip meson-274445d247afd44afc408af5a8d130ae9a7c270c.tar.gz meson-274445d247afd44afc408af5a8d130ae9a7c270c.tar.bz2 | |
CI/MacOS: Fix paths that have changed from /usr/local to /opt/homebrew
homebrew installs to /usr/local on Intel based macs, but has moved to
/opt/homebrew for those using Apple Silicon.
| -rw-r--r-- | .github/workflows/macos.yml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 4eb1870..6cf032d 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -40,16 +40,16 @@ jobs: python -m pip install pytest pytest-xdist pytest-subtests fastjsonschema coverage - run: brew install pkg-config ninja llvm qt@5 - env: - CPPFLAGS: "-I/usr/local/include" - LDFLAGS: "-L/usr/local/lib" + CPPFLAGS: "-I/opt/homebrew/include" + LDFLAGS: "-L/opt/homebrew/lib" MESON_CI_JOBNAME: unittests-appleclang MESON_UNIT_TEST_BACKEND: ninja HOMEBREW_NO_AUTO_UPDATE: 1 # These cannot evaluate anything, so we cannot set PATH or SDKROOT here run: | export SDKROOT="$(xcodebuild -version -sdk macosx Path)" - export PATH="$HOME/tools:/usr/local/opt/qt@5/bin:$PATH:$(brew --prefix llvm)/bin" - export PKG_CONFIG_PATH="/usr/local/opt/qt@5/lib/pkgconfig:$PKG_CONFIG_PATH" + export PATH="$HOME/tools:/opt/homebrew/opt/qt@5/bin:/opt/homebrew/opt/llvm/bin:$PATH" + export PKG_CONFIG_PATH="/opt/homebrew/opt/qt@5/lib/pkgconfig:$PKG_CONFIG_PATH" ./tools/run_with_cov.py ./run_unittests.py - name: Aggregate coverage reports @@ -93,7 +93,7 @@ jobs: # Delete nonsensical PEP 668 breakage. It is the wrong solution to the problem and isn't designed to be # productive -- only victim blaming -- however it bites particularly badly because this is a container/VM # See commit 5c479d7a13a518c18ccb4dc3b6bdd7bfc2a9bdb5 for a more thorough analysis. - find /usr/local/Cellar/python* -name EXTERNALLY-MANAGED -print0 | xargs -0 rm -vf + find /opt/homebrew/Cellar/python* -name EXTERNALLY-MANAGED -print0 | xargs -0 rm -vf # use python3 from homebrew because it is a valid framework, unlike the actions one: # https://github.com/actions/setup-python/issues/58 - run: brew install pkg-config ninja llvm qt@5 boost ldc hdf5 openmpi lapack scalapack sdl2 boost-python3 gtk-doc @@ -102,16 +102,16 @@ jobs: python3 -m pip install --upgrade pip python3 -m pip install cython coverage - env: - CPPFLAGS: "-I/usr/local/include" - LDFLAGS: "-L/usr/local/lib" + CPPFLAGS: "-I/opt/homebrew/include" + LDFLAGS: "-L/opt/homebrew/lib" MESON_ARGS: --unity=${{ matrix.unity }} CI: 1 # These cannot evaluate anything, so we cannot set PATH or SDKROOT here run: | export SDKROOT="$(xcodebuild -version -sdk macosx Path)" - export PATH="$HOME/tools:/usr/local/opt/qt@5/bin:$PATH:$(brew --prefix llvm)/bin" - export PKG_CONFIG_PATH="/usr/local/opt/qt@5/lib/pkgconfig:$PKG_CONFIG_PATH" - export XML_CATALOG_FILES="/usr/local/etc/xml/catalog" + export PATH="$HOME/tools:/opt/homebrew/opt/qt@5/bin:/opt/homebrew/opt/llvm/bin:$PATH" + export PKG_CONFIG_PATH="/opt/homebrew/opt/qt@5/lib/pkgconfig:/opt/homebrew/opt/lapack/lib/pkgconfig:/opt/homebrew/opt/ncurses/lib/pkgconfig:$PKG_CONFIG_PATH" + export XML_CATALOG_FILES="/opt/homebrew/etc/xml/catalog" ./tools/run_with_cov.py ./run_project_tests.py --backend=ninja - name: Aggregate coverage reports |