Skip to content

Commit e297d3c

Browse files
authored
Merge pull request #207 from RadWolfie/hotfix-ci
HOTFIX: Fix arch typo and use latest macOS with target arch
2 parents 22110c6 + 536450d commit e297d3c

1 file changed

Lines changed: 8 additions & 6 deletions

File tree

.github/workflows/ci.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
const platforms = [
8383
{"platform": "Windows", "folder": "win", "cmake-build-param": "-j $env:NUMBER_OF_PROCESSORS"},
8484
{"platform": "Linux", "folder": "linux", "cmake-build-param": "-j $(nproc --all)", "cmake-generator": "-G \"Unix Makefiles\""},
85-
{"platform": "macOS", "folder": "macos", "cmake-build-param": "-j $(sysctl -n hw.ncpu)", "cmake-generator": "-G Xcode"}
85+
{"platform": "macOS", "folder": "macos", "cmake-build-param": "-j $(sysctl -n hw.ncpu)"}
8686
];
8787
let builder = [];
8888
for (let build of platforms.values()) {
@@ -105,13 +105,15 @@ jobs:
105105
builder.push(Object.assign({}, build));
106106
}
107107
if (build.platform === "macOS") {
108-
// create x64 build (only on macos-13 and earlier)
109-
build["os"] = "macos-13";
108+
// always use the latest os
109+
build["os"] = "macos-latest";
110+
// create x64 build
110111
build["arch"] = "x64";
112+
build["cmake-generator"] = "-G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64";
111113
builder.push(Object.assign({}, build));
112-
// create amd64 build (only on macos-14 and later)
113-
build["os"] = "macos-latest";
114-
build["arch"] = "amd64";
114+
// create arm64 build
115+
build["arch"] = "arm64";
116+
build["cmake-generator"] = "-G Xcode -DCMAKE_OSX_ARCHITECTURES=arm64";
115117
builder.push(Object.assign({}, build));
116118
}
117119
}

0 commit comments

Comments
 (0)