Merge pull request #207 from RadWolfie/hotfix-ci

HOTFIX: Fix arch typo and use latest macOS with target arch
Cxbx-Reloaded · May 7, 2024 · e297d3c · e297d3c
2 parents 22110c6 + 536450d
commit e297d3c
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -82,7 +82,7 @@ jobs:
             const platforms = [
                 {"platform": "Windows", "folder": "win", "cmake-build-param": "-j $env:NUMBER_OF_PROCESSORS"},
                 {"platform": "Linux", "folder": "linux", "cmake-build-param": "-j $(nproc --all)", "cmake-generator": "-G \"Unix Makefiles\""},
-                {"platform": "macOS", "folder": "macos", "cmake-build-param": "-j $(sysctl -n hw.ncpu)", "cmake-generator": "-G Xcode"}
+                {"platform": "macOS", "folder": "macos", "cmake-build-param": "-j $(sysctl -n hw.ncpu)"}
             ];
             let builder = [];
             for (let build of platforms.values()) {
@@ -105,13 +105,15 @@ jobs:
                 builder.push(Object.assign({}, build));
               }
               if (build.platform === "macOS") {
-                // create x64 build (only on macos-13 and earlier)
-                build["os"] = "macos-13";
+                // always use the latest os
+                build["os"] = "macos-latest";
+                // create x64 build
                 build["arch"] = "x64";
+                build["cmake-generator"] = "-G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64";
                 builder.push(Object.assign({}, build));
-                // create amd64 build (only on macos-14 and later)
-                build["os"] = "macos-latest";
-                build["arch"] = "amd64";
+                // create arm64 build
+                build["arch"] = "arm64";
+                build["cmake-generator"] = "-G Xcode -DCMAKE_OSX_ARCHITECTURES=arm64";
                 builder.push(Object.assign({}, build));
               }
             }