Only on Linux

Stefterv · Stefterv · commit 9d257de0b966 · 2025-03-11T09:17:10.000+01:00
Snap Distribution

Fix missing snapcraft

Fix missing lxd

Fix missing lxd
diff --git a/.github/workflows/build-gradle.yml b/.github/workflows/build-gradle.yml
@@ -41,6 +41,12 @@ jobs:
           architecture: ${{ matrix.arch }}
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
+      - name: Install Snapcraft
+        if: runner.os == 'Linux'
+        uses: samuelmeuli/action-snapcraft@v3
+      - name: Install LXD
+        if: runner.os == 'Linux'
+        uses: canonical/setup-lxd@main
       - name: Build with Gradle
         run: ./gradlew packageDistributionForCurrentOS
       - name: Add instructions
@@ -56,4 +62,5 @@ jobs:
             ./app/build/compose/binaries/main/dmg/INSTRUCTIONS_FOR_TESTING.txt
             ./app/build/compose/binaries/main/msi/Processing-*.msi
             ./app/build/compose/binaries/main/deb/processing*.deb
+            ./app/build/compose/binaries/main/processing*.snap
           retention-days: 1
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -157,6 +157,61 @@ tasks.register<Exec>("packageCustomMsi"){
     )
 }
 
+tasks.register("generateSnapConfiguration"){
+    onlyIf { org.gradle.internal.os.OperatingSystem.current().isLinux }
+    val distributable = tasks.named<AbstractJPackageTask>("createDistributable").get()
+    dependsOn(distributable)
+
+    val arch = when (System.getProperty("os.arch")) {
+        "amd64", "x86_64" -> "amd64"
+        else -> System.getProperty("os.arch")
+    }
+
+    val dir = distributable.destinationDir.get()
+    val content = """
+    name: ${rootProject.name}
+    version: ${rootProject.version}
+    base: core22
+    summary: A creative coding editor
+    description: |
+      Processing is a flexible software sketchbook and a programming language designed for learning how to code.
+    confinement: strict
+    
+    apps:
+      processing:
+        command: opt/processing/bin/Processing
+        desktop: opt/processing/lib/processing-Processing.desktop
+        plugs:
+          - desktop
+          - desktop-legacy
+          - wayland
+          - x11
+    
+    parts:
+      processing:
+        plugin: dump
+        source: deb/processing_$version-1_$arch.deb
+        source-type: deb
+        stage-packages:
+          - openjdk-17-jdk
+        override-prime: |
+          snapcraftctl prime
+          chmod -R +x opt/processing/lib/app/resources/jdk-*
+    """.trimIndent()
+    dir.file("../snapcraft.yaml").asFile.writeText(content)
+}
+
+tasks.register<Exec>("packageSnap"){
+    onlyIf { org.gradle.internal.os.OperatingSystem.current().isLinux }
+    dependsOn("packageDeb", "generateSnapConfiguration")
+    group = "compose desktop"
+
+    val distributable = tasks.named<AbstractJPackageTask>("createDistributable").get()
+    workingDir = distributable.destinationDir.dir("../").get().asFile
+
+    commandLine("snapcraft")
+}
+
 afterEvaluate{
     tasks.named("packageDmg").configure{
         dependsOn("packageCustomDmg")
@@ -168,6 +223,9 @@ afterEvaluate{
         group = "compose desktop"
         actions = emptyList()
     }
+    tasks.named("packageDistributionForCurrentOS").configure {
+        dependsOn("packageSnap")
+    }
 }
 
 
