Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use macos-14 workers to create libraries #42

Merged
merged 4 commits into from
Sep 7, 2024
Merged

Use macos-14 workers to create libraries #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7034da4
Use macos-14 workers to create libraries
janisozaur Aug 21, 2024
fd04327
Update vcpkg to current version
janisozaur Aug 21, 2024
cc7f75d
Add explicit architecture information to x64-osx-openrct2 triplet
janisozaur Sep 7, 2024
44c1e74
Update vcpkg to corrent version
janisozaur Sep 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: CI
on: [push, pull_request]
env:
VCPKG_COMMIT_HASH: 576379156e82da642f8d1834220876759f13534d
VCPKG_COMMIT_HASH: 68d349964cb4e8da561fd849d9491e6ba11c5681
jobs:
createrelease:
name: createrelease
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
asset_content_type: application/zip
macos-build:
name: macOS
runs-on: macos-12
runs-on: macos-14
needs: createrelease
if: always()
strategy:
Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:

macos-package:
name: macOS package universal library
runs-on: macos-latest
runs-on: macos-14
needs: macos-build
if: always()
steps:
Expand Down
2 changes: 1 addition & 1 deletion vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@
"version": "2022-07-12#5"
}
],
"builtin-baseline":"576379156e82da642f8d1834220876759f13534d"
"builtin-baseline":"68d349964cb4e8da561fd849d9491e6ba11c5681"

}
1 change: 1 addition & 0 deletions x64-osx-openrct2.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ set(VCPKG_CRT_LINKAGE dynamic)
set(VCPKG_LIBRARY_LINKAGE dynamic)

set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
set(VCPKG_OSX_ARCHITECTURES x86_64)
set(VCPKG_OSX_DEPLOYMENT_TARGET "10.13")

set(VCPKG_BUILD_TYPE release)
Loading