diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index db2295695..4ae5c253e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,16 +24,11 @@ jobs: cc: cl cxx: cl name: Windows-x64 - - runner: macos-14 # Apple Silicon, but we cross-compile + - runner: macos-14 # Apple Silicon, but we make a universal binary preset: mac cc: cc cxx: c++ - name: macOS-Intel - - runner: macos-14 # Apple Silicon - preset: mac - cc: cc - cxx: c++ - name: macOS-ARM + name: macOS - runner: ubuntu-latest preset: linux cc: gcc @@ -61,18 +56,22 @@ jobs: submodules: recursive - name: Install macOS Rosetta 2 - if: ${{ matrix.os.name == 'macOS-Intel' }} + if: ${{ matrix.os.preset == 'mac' }} run: /usr/sbin/softwareupdate --install-rosetta --agree-to-license + - name: Install macOS ARM dependencies + if: ${{ matrix.os.preset == 'mac' }} + run: brew bundle install + - name: Install Intel version of Brew - if: ${{ matrix.os.name == 'macOS-Intel' }} + if: ${{ matrix.os.preset == 'mac' }} 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 + - name: Install macOS Intel dependencies if: ${{ matrix.os.preset == 'mac' }} run: brew bundle install