Build fixes

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

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -31,11 +31,6 @@ jobs:
           cache: gradle
           github-token: ${{ secrets.JRELEASER_GITHUB_TOKEN }}
 
-      - name: Echo JAVA_HOME
-        run: echo $JAVA_HOME
-      - name: Verify Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
-
       - name: Install create-dmg for macOS
         run: ${{ !startsWith(matrix.os, 'mac') }} || brew install create-dmg
         shell: bash

diff --git a/gradle/build.gradle b/gradle/build.gradle
@@ -199,7 +199,7 @@ task bundleDmg(type: org.gradle.api.DefaultTask) {
                 commandLine "$projectDir/misc/macos_notarize.sh", "$projectDir"
             }
             exec {
-                commandLine "$projectDir/misc/macos_dmg.sh", "$projectDir"
+                commandLine "$projectDir/misc/macos_dmg.sh", "$projectDir", System.getProperty("os.arch") == 'aarch64' ? 'arm64' : 'x86_64'
             }
         }
     }

diff --git a/misc/macos_dmg.sh b/misc/macos_dmg.sh
@@ -2,8 +2,9 @@
 
 set -e
 
+ARCH="$2"
 APP_DIR="$1/build/dist/Pdx-Unlimiter.app"
-DMG_FILE="$1/build/pdx_unlimiter-macos-x86_64.dmg"
+DMG_FILE="$1/build/pdx_unlimiter-macos-$ARCH.dmg"
 
 echo "$DMG_FILE"
 mkdir -p "$1/build/dist/"
-Original file line number
+Diff line change
@@ Expand Up / @@ -199,7 +199,7 @@ task bundleDmg(type: org.gradle.api.DefaultTask) { @@
                     commandLine "$projectDir/misc/macos_notarize.sh", "$projectDir"
                 }
                 exec {
-                    commandLine "$projectDir/misc/macos_dmg.sh", "$projectDir"
+                    commandLine "$projectDir/misc/macos_dmg.sh", "$projectDir", System.getProperty("os.arch") == 'aarch64' ? 'arm64' : 'x86_64'
                 }
             }
         }
@@ Expand Down @@