Test github arm64 macos runner

Legacy-Fabric · Feb 2, 2024 · 6b266b6 · 6b266b6
1 parent 5988a43
commit 6b266b6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/.github/workflows/build_or_publish.yml b/.github/workflows/build_or_publish.yml
@@ -7,28 +7,26 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: windows-latest
+          - os: windows-2022
             arch: x86
             java_arch: x86
             msvc_arch: amd64_x86
-          - os: windows-latest
+          - os: windows-2022
             arch: x64
             java_arch: x64
             msvc_arch: amd64
-          - os: windows-latest
+          - os: windows-2022
             arch: arm64
             java_arch: x64
             msvc_arch: amd64_arm64
             extra_java: 17
             vendor: zulu
-          - os: macos-latest
+          - os: macos-13
             arch: x64
             java_arch: x64
-          - os: macos-latest
+          - os: macos-14
             arch: arm64
-            java_arch: x64
-            extra_java: 8
-            vendor: zulu
+            java_arch: arm64
           - os: ubuntu-20.04
             arch: i386
             java_arch: x64

diff --git a/gradle/macosx.gradle b/gradle/macosx.gradle
@@ -7,11 +7,11 @@ def target_arch = ENV.ARCHITECTURE ? getArch(ENV.ARCHITECTURE) : os_arch
 
 def java_home = System.getProperty("java.home")
 
-if (ENV.ARCHITECTURE) {
-    if (ENV.ARCHITECTURE == "arm64") {
-        java_home = ENV.JAVA_HOME_8_ARM64 + "/jre"
-    }
-}
+//if (ENV.ARCHITECTURE) {
+//    if (ENV.ARCHITECTURE == "arm64") {
+//        java_home = ENV.JAVA_HOME_8_ARM64 + "/jre"
+//    }
+//}
 
 def javavmroot = java_home + "/.."