Skip to content

Commit

Permalink
Use macos-14 runners for x64-osx builds (#5815)
Browse files Browse the repository at this point in the history
* Use macos-15 runners for x64-osx builds

* Update macos.yml

* Explicitly set target arch

* Update macos.yml
  • Loading branch information
m-kuhn authored Nov 16, 2024
1 parent 1ab3797 commit 81ce4b3
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,14 @@ jobs:
strategy:
matrix:
include:
- os: macos-13
- os: macos-14
triplet: x64-osx
deployment-target: "10.15"
target-arch: x86_64
- os: macos-14
triplet: arm64-osx
deployment-target: "11.0"
target-arch: arm64
name: build (macos)
runs-on: ${{ matrix.os }}

Expand Down Expand Up @@ -118,6 +120,8 @@ jobs:
-D MACOS_CODE_SIGN_IDENTITY="Apple Development" \
-D CMAKE_CXX_VISIBILITY_PRESET=hidden \
-D CMAKE_OSX_DEPLOYMENT_TARGET=${{ matrix.deployment-target }} \
-D CMAKE_OSX_ARCHITECTURES=${{ matrix.target-arch }} \
-D VCPKG_TARGET_TRIPLET=${{ matrix.triplet }} \
-D WITH_CCACHE=ON
- name: 🌋 Build
Expand Down

1 comment on commit 81ce4b3

@qfield-fairy
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.