Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compile macOS Intel Version on Apple Silicon #656

Merged
merged 16 commits into from
Dec 18, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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++
Expand Down Expand Up @@ -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' }}
Expand Down
Loading