Fixes for ARM macOS CI.

Apprentice-Alchemist · Jun 29, 2024 · c7e096b · c7e096b
1 parent f0c7c0a
commit c7e096b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -710,6 +710,9 @@ jobs:
         include:
           - target: hl
             BREW_PACKAGES: ninja
+        exclude:
+          - os: macos-14
+            target: hl
     steps:
       - uses: actions/checkout@main
         with:

diff --git a/extra/github-actions/workflows/main.yml b/extra/github-actions/workflows/main.yml
@@ -406,6 +406,9 @@ jobs:
         include:
           - target: hl
             BREW_PACKAGES: ninja
+        exclude:
+          - os: macos-14
+            target: hl
     steps:
       - uses: actions/checkout@main
         with:

diff --git a/tests/misc/neko/projects/Issue10937/Main.hx b/tests/misc/neko/projects/Issue10937/Main.hx
@@ -60,8 +60,8 @@ function main() {
 
 	final expectedNdllSubDir = Sys.systemName() + arch.getNdllSuffix() + "/";
 
+	trace(neko.vm.Loader.local().getPath());
 	final ndllPath = neko.vm.Loader.local().getPath()[0];
-
 	if (ndllPath.endsWith(expectedNdllSubDir)) {
 		Sys.println("Success");
 	} else {

diff --git a/tests/runci/targets/Cpp.hx b/tests/runci/targets/Cpp.hx
@@ -54,6 +54,8 @@ class Cpp {
 				'HXCPP_M32';
 			case 'Linux' if(Linux.arch == Arm64):
 				'HXCPP_LINUX_ARM64';
+			case 'Mac' if(commandResult('arch').stdout == "arm64"):
+				'HXCPP_ARM64';
 			case _:
 				'HXCPP_M64';
 		}

diff --git a/tests/runci/targets/Lua.hx b/tests/runci/targets/Lua.hx
@@ -22,7 +22,9 @@ class Lua {
 					runNetworkCommand("brew", ["install", "python3"]);
 
 				attemptCommand("brew", ["install", "pcre2"]);
-				runCommand("pip3", ["install", "hererocks"]);
+				runCommand("pip3", ["install", "--user", "hererocks"]);
+				final pyUserBase = commandResult("python", ["-m", "site", "--user-base"]).stdout.trim();
+				addToPATH(Path.join([pyUserBase, "bin"]));
 				runCommand("brew", ["install", "openssl"]);
 			}
 		}