ubuntu latest, jpackage deps mgmt

sblantipodi · Dec 22, 2024 · 72c0dae · 72c0dae
1 parent 6e5b5d2
commit 72c0dae
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -100,15 +100,19 @@ jobs:
           ls -la target
           rm -rf target/fireflyluciferin-${{steps.get-id.outputs.id}}.jar;
           jpackage -i target --main-class org.dpsoftware.JavaFXStarter --main-jar FireflyLuciferin-jar-with-dependencies.jar --icon data/img/luciferin_logo.png --linux-shortcut --copyright "Davide Perini" --name FireflyLuciferin  --vendor DPsoftware --app-version "${{steps.get-id.outputs.id}}" --java-options "-XX:+UseZGC -XX:+UseStringDeduplication -Xms64m -Xmx1024m --add-modules=jdk.incubator.vector --enable-native-access=org.dpsoftware --enable-native-access=ALL-UNNAMED"
-          dpkg-deb -R FireflyLuciferinLinux.deb firetoedit
-          sed -i 's/libasound2t64/libasound2/g' "firetoedit/DEBIAN/control"
-          dpkg-deb -b firetoedit FireflyLuciferinLinux.deb
-          rm rf firetoedit
       - name: Adding Linux asset to the release (Debian flavour)
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           mv firefly* FireflyLuciferinLinux.deb;
+      - name: Deps fix
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          dpkg-deb -R FireflyLuciferinLinux.deb firetoedit
+          sed -i 's/libasound2t64/libasound2/g' "firetoedit/DEBIAN/control"
+          dpkg-deb -b firetoedit FireflyLuciferinLinux.deb
+          rm rf firetoedit
       - name: Creating artifact from BIN file
         uses: actions/upload-artifact@v4
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -125,15 +125,15 @@ jobs:
           ls -la target
           rm -rf target/fireflyluciferin-${{steps.get-id.outputs.id}}.jar;
           jpackage -i target --main-class org.dpsoftware.JavaFXStarter --main-jar FireflyLuciferin-jar-with-dependencies.jar --icon data/img/luciferin_logo.png --linux-shortcut --copyright "Davide Perini" --name FireflyLuciferin  --vendor DPsoftware --app-version "${{steps.get-id.outputs.id}}" --java-options "-XX:+UseZGC -XX:+UseStringDeduplication -Xms64m -Xmx1024m --add-modules=jdk.incubator.vector --enable-native-access=org.dpsoftware --enable-native-access=ALL-UNNAMED"
-          dpkg-deb -R FireflyLuciferinLinux.deb firetoedit
-          sed -i 's/libasound2t64/libasound2/g' "firetoedit/DEBIAN/control"
-          dpkg-deb -b firetoedit FireflyLuciferinLinux.deb
-          rm rf firetoedit
       - name: Adding Linux asset to the release (Debian flavour)
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           mv firefly* FireflyLuciferinLinux.deb;
+          dpkg-deb -R FireflyLuciferinLinux.deb firetoedit
+          sed -i 's/libasound2t64/libasound2/g' "firetoedit/DEBIAN/control"
+          dpkg-deb -b firetoedit FireflyLuciferinLinux.deb
+          rm rf firetoedit
           gh release upload "${{ env.RELEASE_VERSION }}" FireflyLuciferinLinux.deb
 
       - name: Adding Linux asset to the release (RedHat flavour)

diff --git a/build_tools b/build_tools