Skip to content

Fix for MacOS x86_64 Installer #3314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Frooodle merged 4 commits into from
Apr 9, 2025
Merged

Fix for MacOS x86_64 Installer #3314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
41585d1
updated workflow step to log jpackage dir
DarioGii Apr 9, 2025
2fb9166
wip - testing artifact creation
DarioGii Apr 9, 2025
10042f6
removed trigger for testing
DarioGii Apr 9, 2025
7a33c84
Merge branch 'main' into mac-x86_64-installer-fix
Frooodle Apr 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/multiOSReleases.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ jobs:
id: prepare
shell: bash
run: |
ls -lah ./build/jpackage/
mkdir ./binaries
if [ "${{ matrix.os }}" = "windows-latest" ]; then
mv "./build/jpackage/Stirling-PDF-${{ needs.read_versions.outputs.version }}.exe" "./binaries/Stirling-PDF-win-installer.exe"
Expand Down
10 changes: 6 additions & 4 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ jpackage {
icon = "src/main/resources/static/favicon.icns"
type = "dmg"
macPackageIdentifier = "com.stirling.software.pdf"
macPackageName = "Stirling-PDF_aarch64"
macPackageName = "Stirling-PDF-aarch64"
macAppCategory = "public.app-category.productivity"
macSign = false // Enable signing
macAppStore = false // Not targeting App Store initially
Expand Down Expand Up @@ -230,6 +230,8 @@ tasks.register('jpackageMacX64') {
group = 'distribution'
description = 'Packages app for MacOS x86_64'

println "Running jpackageMacX64 task"

if (OperatingSystem.current().isMacOsX()) {
println "MacOS detected. Downloading temp JRE."
dependsOn("downloadTempJre")
Expand Down Expand Up @@ -270,11 +272,11 @@ tasks.register('jpackageMacX64') {
def stderr = errorStream.toString("UTF-8")

if (!stdout.isBlank()) {
println "📝 jpackage stdout:\n$stdout"
println "jpackage stdout:\n$stdout"
}

if (result.exitValue != 0) {
throw new GradleException("❌ jpackage failed with exit code ${result.exitValue}.\n\n$stderr")
throw new GradleException("jpackage failed with exit code ${result.exitValue}.\n\n$stderr")
}
}
}
Expand Down Expand Up @@ -322,7 +324,7 @@ tasks.register('cleanTempJre') {
def path = project.ext.tempJrePath

if (path && new File("$path").exists()) {
println "🧹 Cleaning up temporary JRE: $path"
println "Cleaning up temporary JRE: $path"
new File("$path").parentFile.deleteDir()
}
}
Expand Down