ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Nadia Holmquist Pedersen 2024-02-07 22:27:04 +01:00 committed by GitHub
parent a7575ec7b3
commit 17a1bfa673
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/build-macos.yml vendored
View File

@ -15,7 +15,7 @@ jobs:
arch: [x86_64, arm64] arch: [x86_64, arm64]
name: ${{ matrix.arch }} name: ${{ matrix.arch }}
runs-on: macos-13 runs-on: macos-14
steps: steps:
- name: Check out sources - name: Check out sources
uses: actions/checkout@v3 uses: actions/checkout@v3
@ -27,7 +27,7 @@ jobs:
- name: Set up vcpkg - name: Set up vcpkg
uses: lukka/run-vcpkg@v11 uses: lukka/run-vcpkg@v11
with: with:
vcpkgGitCommitId: c8696863d371ab7f46e213d8f5ca923c4aef2a00 vcpkgGitCommitId: 53bef8994c541b6561884a8395ea35715ece75db
- name: Build - name: Build
uses: lukka/run-cmake@v10 uses: lukka/run-cmake@v10
with: with:
@ -48,6 +48,7 @@ jobs:
name: Universal binary name: Universal binary
needs: [build-macos] needs: [build-macos]
runs-on: macos-13 runs-on: macos-13
continue-on-error: true
steps: steps:
- name: Download x86_64 - name: Download x86_64
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4

2
cmake/ConfigureVcpkg.cmake
View File

@ -7,7 +7,7 @@ if (VCPKG_ROOT STREQUAL "${_DEFAULT_VCPKG_ROOT}")
file(LOCK "${_DEFAULT_VCPKG_ROOT}" DIRECTORY GUARD FILE) file(LOCK "${_DEFAULT_VCPKG_ROOT}" DIRECTORY GUARD FILE)
FetchContent_Declare(vcpkg FetchContent_Declare(vcpkg
GIT_REPOSITORY "https://github.com/Microsoft/vcpkg.git" GIT_REPOSITORY "https://github.com/Microsoft/vcpkg.git"
GIT_TAG 2023.12.12 GIT_TAG 2024.01.12
SOURCE_DIR "${CMAKE_SOURCE_DIR}/vcpkg") SOURCE_DIR "${CMAKE_SOURCE_DIR}/vcpkg")
FetchContent_MakeAvailable(vcpkg) FetchContent_MakeAvailable(vcpkg)
endif() endif()