Skip to content

Commit

Permalink
Merge pull request #60 from Arcnor/macos-runners
Browse files Browse the repository at this point in the history
enable both Intel & M1 macOS runners
  • Loading branch information
Lgt2x authored Apr 18, 2024
2 parents 099d698 + dcfdbf0 commit ee54783
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ jobs:
matrix:
os:
- {runner: windows-latest, preset: win}
- {runner: macos-latest, preset: mac}
- {runner: macos-12, preset: mac} # This is supposed to be Intel for now, and what macos-latest is defaulting to for some reason (as of 04/2024)
- {runner: macos-14, preset: mac} # This is supposed to be M1
- {runner: ubuntu-latest, preset: linux}
build_type: [Debug, Release]

Expand Down Expand Up @@ -47,5 +48,5 @@ jobs:
- name: Upload Artifacts
uses: actions/upload-artifact@v4
with:
name: build_${{ matrix.os.preset }}_${{ matrix.build_type }}
name: build_${{ matrix.os.runner }}_${{ matrix.build_type }}
path: ${{ github.workspace }}/build/Descent3/${{ matrix.build_type }}

0 comments on commit ee54783

Please sign in to comment.