mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-07-11 23:30:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Create separate x86_64 and ARM64 macOS targets. (#3760)

Browse Source 
Create explicit x86_64 and ARM64 macOS build targets, so it's clear that
the CI is building x86_64 binaries (on both Intel and ARM64 build
machines). Also, use the `CMAKE_APPLE_SILICON_PROCESSOR` CMake variable
(which sets `CMAKE_SYSTEM_PROCESSOR`) so `BUILD_X86_ON_MACOS` is not
necessary.

And update the README.
This commit is contained in:
Brendan Shanks
2024-11-17 12:59:57 -08:00
committed by GitHub
parent 24ad5515f8
commit 8f445bda3e
6 changed files with 50 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build-matrix.yaml
+2 -2
View File
@@ -49,12 +49,12 @@ jobs:
name: "🍎 MacOS"
uses: ./.github/workflows/macos-build.yaml
with:
cmakePreset: "Release-macos-clang"
cmakePreset: "Release-macos-x86_64-clang"
cachePrefix: ""
build_macos_arm:
name: "🍎 MacOS"
uses: ./.github/workflows/macos-build-arm.yaml
with:
cmakePreset: "Release-macos-rosetta-clang"
cmakePreset: "Release-macos-x86_64-clang"
cachePrefix: ""
.github/workflows/release-pipeline.yaml
+2 -2
View File
@@ -74,7 +74,7 @@ jobs:
name: "🍎 MacOS"
uses: ./.github/workflows/macos-build.yaml
with:
cmakePreset: "Release-macos-clang-static"
cmakePreset: "Release-macos-x86_64-clang-static"
cachePrefix: "static"
uploadArtifacts: true
secrets: inherit
@@ -85,7 +85,7 @@ jobs:
name: "🍎 MacOS"
uses: ./.github/workflows/macos-build.yaml
with:
cmakePreset: "Release-macos-rosetta-clang-static"
cmakePreset: "Release-macos-x86_64-clang-static"
cachePrefix: "static"
uploadArtifacts: true
secrets: inherit