Skip to content

Commit

Permalink
macOS CI updates (melonDS-emu#1973)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
nadiaholmquist authored Feb 7, 2024
1 parent a7575ec commit 17a1bfa
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmake/ConfigureVcpkg.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if (VCPKG_ROOT STREQUAL "${_DEFAULT_VCPKG_ROOT}")
file(LOCK "${_DEFAULT_VCPKG_ROOT}" DIRECTORY GUARD FILE)
FetchContent_Declare(vcpkg
GIT_REPOSITORY "https://github.com/Microsoft/vcpkg.git"
GIT_TAG 2023.12.12
GIT_TAG 2024.01.12
SOURCE_DIR "${CMAKE_SOURCE_DIR}/vcpkg")
FetchContent_MakeAvailable(vcpkg)
endif()
Expand Down

0 comments on commit 17a1bfa

Please sign in to comment.