Skip to content

Commit

Permalink
Merge pull request OpenBrickProtocolFoundation#135 from mgerhold/fix-…
Browse files Browse the repository at this point in the history
…macos-in-ci

fix macos issue with new github runner images
  • Loading branch information
Totto16 authored Mar 18, 2024
2 parents 965d39b + 699d61f commit 20f4374
Showing 1 changed file with 13 additions and 6 deletions.
19 changes: 13 additions & 6 deletions .github/workflows/meson.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,16 +127,23 @@ jobs:
echo "CC_LD=lld" >> "$GITHUB_ENV"
echo "CXX_LD=lld" >> "$GITHUB_ENV"
- name: Install python and meson (MacOS ARM64)
if: matrix.config.os == 'macos' && matrix.config.arm
- name: Unbreak Python in GHA for 3.11 (MacOS 13 image)
if: matrix.config.os == 'macos' && matrix.config.os-version == 13
run: |
# A workaround for "The `brew link` step did not complete successfully" error.
# See https://github.com/Homebrew/homebrew-core/issues/165793#issuecomment-1991817938
find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete
sudo rm -rf /Library/Frameworks/Python.framework/
brew install --force python3 && brew unlink python3 && brew unlink python3 && brew link --overwrite python3
- name: Setup meson (MacOS)
if: matrix.config.os == 'macos'
run: |
brew update
brew install [email protected]
brew install meson
echo "/opt/homebrew/opt/[email protected]/libexec/bin" >> $GITHUB_PATH
brew install meson
- name: Setup meson
if: matrix.config.os != 'macos' || (! matrix.config.arm)
if: matrix.config.os != 'macos'
run: |
python -m pip install --upgrade pip
pip install meson
Expand Down

0 comments on commit 20f4374

Please sign in to comment.