aboutsummaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorNadia Holmquist Pedersen <nadia@nhp.sh>2024-02-07 22:27:04 +0100
committerGitHub <noreply@github.com>2024-02-07 22:27:04 +0100
commit17a1bfa6734bfd3603a3d9361dc46be3748422ee (patch)
treeb74b0d8e8f3cae85b02aba90778ab0f25d06a963 /.github
parenta7575ec7b3112eff56bbcde6113ab07d90a24265 (diff)
macOS CI updates (#1973)
* Use macOS 14 M1-based runners for macOS CI * Hopefully make the universal build erroring not fail the build (does sometimes with delete-artifact) * Update vcpkg version
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/build-macos.yml5
1 files changed, 3 insertions, 2 deletions
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 5f4b281..349f99d 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -15,7 +15,7 @@ jobs:
arch: [x86_64, arm64]
name: ${{ matrix.arch }}
- runs-on: macos-13
+ runs-on: macos-14
steps:
- name: Check out sources
uses: actions/checkout@v3
@@ -27,7 +27,7 @@ jobs:
- name: Set up vcpkg
uses: lukka/run-vcpkg@v11
with:
- vcpkgGitCommitId: c8696863d371ab7f46e213d8f5ca923c4aef2a00
+ vcpkgGitCommitId: 53bef8994c541b6561884a8395ea35715ece75db
- name: Build
uses: lukka/run-cmake@v10
with:
@@ -48,6 +48,7 @@ jobs:
name: Universal binary
needs: [build-macos]
runs-on: macos-13
+ continue-on-error: true
steps:
- name: Download x86_64
uses: actions/download-artifact@v4