diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index beb930ce..a568f3bc 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -32,7 +32,7 @@ jobs: arch: x64 os: macOS-latest shell: bash - buildPackage: ./scripts/BuildMacPkg.sh + buildPackage: ./scripts/BuildMacDmg.sh buildJar: ./scripts/BuildUnixJar.sh - runtime: win-x64 @@ -69,7 +69,7 @@ jobs: security import certificate.p12 -k build.keychain -P ${{ secrets.APPLE_CERT_PASSWORD }} -T /usr/bin/codesign security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k ${{ secrets.APPLE_KEYCHAIN_PASSWORD }} build.keychain - ${{ matrix.buildPackage }} notarizePkg \ + ${{ matrix.buildPackage }} notarizeDmg \ -Pcompose.desktop.mac.sign=true \ -Pcompose.desktop.mac.signing.identity=${{ secrets.APPLE_IDENTITY }} \ -Pcompose.desktop.mac.notarization.appleID=${{ secrets.APPLE_ID }} \ diff --git a/build.gradle.kts b/build.gradle.kts index 31b13752..1e95f4c7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -128,7 +128,7 @@ compose.desktop { TargetFormat.Deb, TargetFormat.Rpm, // MacOS - TargetFormat.Pkg + TargetFormat.Dmg ) modules( "java.instrument", diff --git a/scripts/BuildMacPkg.sh b/scripts/BuildMacDmg.sh similarity index 82% rename from scripts/BuildMacPkg.sh rename to scripts/BuildMacDmg.sh index 27229fa6..e1876511 100755 --- a/scripts/BuildMacPkg.sh +++ b/scripts/BuildMacDmg.sh @@ -9,5 +9,5 @@ if test -f "src/main/resources/Tachidesk.jar"; then rm "src/main/resources/Tachidesk.jar" fi -echo "Building Pkg package" -./gradlew packagePkg "$@" \ No newline at end of file +echo "Building Dmg package" +./gradlew packageDmg "$@" \ No newline at end of file