Build macos arm

crschnick · Nov 3, 2024 · 987231e · 987231e
1 parent 2b6f11d
commit 987231e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -14,13 +14,14 @@ jobs:
         os: [
           ubuntu-latest,
           macos-13,
+          macos-14,
           windows-latest
         ]
       fail-fast: false
     name: ${{ matrix.os }}
     steps:
       - name: Git checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up GraalVM
         uses: graalvm/setup-graalvm@v1
@@ -86,7 +87,9 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: pdx_unlimiter-mac-dev
-          path: build/pdx_unlimiter-macos-x86_64.dmg
+          path: |
+            build/pdx_unlimiter-macos-x86_64.dmg
+            build/pdx_unlimiter-macos-arm64.dmg
           if-no-files-found: ignore
 
       - name: Upload Windows dist as an artifact

diff --git a/gradle/jreleaser.gradle b/gradle/jreleaser.gradle
@@ -86,20 +86,18 @@ jreleaser {
                     platform = 'linux'
                 }
             } else if (org.gradle.internal.os.OperatingSystem.current().isMacOsX() && System.getProperty("os.arch") == 'aarch64') {
-//                artifact {
-//                    distributionType = 'BINARY'
-//                    path = 'build/pdx_unlimiter-mac.zip'
-//                    transform = 'pdx_unlimiter-mac-arm64.zip'
-//                    platform = 'osx'
-//                }
+                artifact {
+                    distributionType = 'BINARY'
+                    path = 'build/pdx_unlimiter-macos-arm64.dmg'
+                    platform = 'osx'
+                }
+            } else if (org.gradle.internal.os.OperatingSystem.current().isMacOsX()) {
+                artifact {
+                    distributionType = 'BINARY'
+                    path = 'build/pdx_unlimiter-macos-x86_64.dmg'
+                    platform = 'osx'
+                }
             }
-//            else if (org.gradle.internal.os.OperatingSystem.current().isMacOsX()) {
-//                artifact {
-//                    distributionType = 'BINARY'
-//                    path = 'build/pdx_unlimiter-macos-x86_64.dmg'
-//                    platform = 'osx'
-//                }
-//            }
         }
     }