Distribution Bugfixes

[skip ci]
This commit is contained in:
Stef Tervelde
2025-03-12 12:55:38 +01:00
parent 742761d308
commit 405b033f5c
2 changed files with 5 additions and 5 deletions
+2 -2
View File
@@ -89,12 +89,12 @@ jobs:
- os: ubuntu-24.04-arm
os_prefix: linux
arch: aarch64
binary: processing_${{ needs.version.outputs.version }}_arm64
binary: ${{ vars.SNAP_NAME }}_{{ needs.version.outputs.version }}_arm64
extension: snap
- os: ubuntu-latest
os_prefix: linux
arch: x64
binary: processing_${{ needs.version.outputs.version }}_amd64
binary: ${{ vars.SNAP_NAME }}_{{ needs.version.outputs.version }}_amd64
extension: snap
- os: windows-latest
os_prefix: windows
+3 -3
View File
@@ -232,9 +232,7 @@ tasks.register<Exec>("packageSnap"){
val distributable = tasks.named<AbstractJPackageTask>("createDistributable").get()
workingDir = distributable.destinationDir.dir("../").get().asFile
commandLine("snapcraft")
commandLine("cp ${snapname}_${version}_${snaparch}.snap ${name}_${version}_${snaparch}.snap")
}
tasks.register<Exec>("uploadSnap"){
onlyIf { org.gradle.internal.os.OperatingSystem.current().isLinux }
@@ -274,7 +272,9 @@ afterEvaluate{
actions = emptyList()
}
tasks.named("packageDistributionForCurrentOS").configure {
if(compose.desktop.application.nativeDistributions.macOS.notarization.appleID.isPresent){
if(org.gradle.internal.os.OperatingSystem.current().isMacOsX
&& compose.desktop.application.nativeDistributions.macOS.notarization.appleID.isPresent
){
dependsOn("notarizeDmg")
}
dependsOn("packageSnap", "uploadSnap")