From 9feebbfe177a3ec3044f5c30607c73e9bae7c60c Mon Sep 17 00:00:00 2001 From: Syer10 Date: Tue, 8 Apr 2025 12:34:24 -0400 Subject: [PATCH] Use tar for MacOS --- .github/workflows/build_push.yml | 6 ------ scripts/bundler.sh | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index accb6796..dab62aa6 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -102,12 +102,6 @@ jobs: - name: Package JDK run: jlink --add-modules java.base,java.compiler,java.datatransfer,java.desktop,java.instrument,java.logging,java.management,java.naming,java.prefs,java.scripting,java.se,java.security.jgss,java.security.sasl,java.sql,java.transaction.xa,java.xml,jdk.attach,jdk.crypto.ec,jdk.jdi,jdk.management,jdk.net,jdk.random,jdk.unsupported,jdk.unsupported.desktop,jdk.zipfs --output suwa --strip-debug --no-man-pages --no-header-files --compress=2 - - name: Chmod JRE - if: matrix.name == 'macOS-arm64' || matrix.name == 'macOS-x64' || matrix.name == 'linux-x64' - run: | - chmod +x ./suwa/bin/java - chmod +x ./suwa/lib/jspawnhelper - - name: Upload JRE package uses: actions/upload-artifact@v4 with: diff --git a/scripts/bundler.sh b/scripts/bundler.sh index 90bf2794..a8e55738 100755 --- a/scripts/bundler.sh +++ b/scripts/bundler.sh @@ -191,7 +191,7 @@ make_macos_bundle() { cp "$JAR" "$RELEASE_NAME/bin/Suwayomi-Server.jar" cp "scripts/resources/Suwayomi Launcher.command" "$RELEASE_NAME/" - zip -9 -r "$RELEASE" "$RELEASE_NAME/" + tar -I "gzip -9" -cvf "$RELEASE" "$RELEASE_NAME/" } # https://wiki.debian.org/SimplePackagingTutorial