Merge pull request #656 from halprin/macos-rosetta

Compile macOS Intel Version on Apple Silicon
This commit is contained in:
Louis Gombert 2024-12-18 09:26:42 +01:00 committed by GitHub
commit 72f51b0da9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -24,12 +24,12 @@ jobs:
cc: cl
cxx: cl
name: Windows-x64
- runner: macos-13 # Should be Intel
- runner: macos-14 # Apple Silicon, but we cross-compile
preset: mac
cc: cc
cxx: c++
name: macOS-Intel
- runner: macos-14 # This is supposed to be M1
- runner: macos-14 # Apple Silicon
preset: mac
cc: cc
cxx: c++
@ -60,11 +60,21 @@ jobs:
with:
submodules: recursive
- name: Install macOS Rosetta 2
if: ${{ matrix.os.name == 'macOS-Intel' }}
run: /usr/sbin/softwareupdate --install-rosetta --agree-to-license
- name: Install Intel version of Brew
if: ${{ matrix.os.name == 'macOS-Intel' }}
shell: arch -x86_64 /bin/bash -e {0}
run: |
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
eval "$(/usr/local/bin/brew shellenv)" # makes the Intel version of Brew and its installs are enshrined as the default
echo "PATH=$PATH" >> $GITHUB_ENV # modify $PATH so the above step persists into the future steps
- name: Install macOS dependencies
if: ${{ matrix.os.preset == 'mac' }}
run: |
# Install packages from Homebrew
brew bundle install
run: brew bundle install
- name: Install Linux dependencies
if: ${{ matrix.os.runner == 'ubuntu-latest' }}