Skip to content

Commit

Permalink
ci: Update to build on both Intel and ARM MacOS systems
Browse files Browse the repository at this point in the history
Added a new entry to the matrix to generate Intel-x64 Mac build for older machines.
  • Loading branch information
dbhart authored Oct 21, 2024
1 parent 9ba43c5 commit 931ef57
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [windows-latest, ubuntu-latest, macos-latest]
os: [windows-latest, ubuntu-latest, macos-13, macos-latest]
include:
- os: windows-latest
cmake_generator: -G "Visual Studio 17 2022" -A "x64"
Expand All @@ -26,6 +26,10 @@ jobs:
cmake_generator: -G "Unix Makefiles"
continue-on-error: false
alias: Linux
- os: macos-13
cmake_generator: -G "Xcode"
continue-on-error: false
alias: Darwin12
- os: macos-latest
cmake_generator: -G "Xcode"
continue-on-error: false
Expand All @@ -41,7 +45,7 @@ jobs:
submodules: true

- name: Build OpenMP Binaries for MacOS via Homebrew
if: ${{ matrix.os == 'macos-latest' }}
if: ${{ matrix.os == 'macos-latest' || matrix.os == 'macos-13' }}
run: |
brew reinstall --build-from-source --formula ./shell/apple/libomp.rb
Expand Down Expand Up @@ -79,4 +83,4 @@ jobs:
name: build-test-artifacts
path: |
build/*.zip
build/*.tar.gz
build/*.tar.gz

0 comments on commit 931ef57

Please sign in to comment.