diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index a194d4ad1..e3f1c052d 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -16,6 +16,8 @@ on: env: JAVA_VERSION: 19 + OPENJFX_JMODS_AMD64: 'https://download2.gluonhq.com/openjfx/19/openjfx-19_linux-x64_bin-jmods.zip' + OPENJFX_JMODS_AARCH64: 'https://download2.gluonhq.com/openjfx/19/openjfx-19_linux-aarch64_bin-jmods.zip' jobs: get-version: @@ -48,11 +50,20 @@ jobs: REVCOUNT: ${{ needs.get-version.outputs.revNum }} - name: Run maven run: mvn -B clean package -Pdependency-check,linux -DskipTests - - name: Create orig.tar.gz with common/ libs/ mods/ + - name: Download OpenJFX jmods + run: | + curl -L ${{ env.OPENJFX_JMODS_AMD64 }} -o openjfx-amd64.zip + mkdir -p jmods/amd64 + unzip -j openjfx-amd64.zip \*/javafx.base.jmod \*/javafx.controls.jmod \*/javafx.fxml.jmod \*/javafx.graphics.jmod -d jmods/amd64 + curl -L ${{ env.OPENJFX_JMODS_AARCH64 }} -o openjfx-aarch64.zip + mkdir -p jmods/aarch64 + unzip -j openjfx-aarch64.zip \*/javafx.base.jmod \*/javafx.controls.jmod \*/javafx.fxml.jmod \*/javafx.graphics.jmod -d jmods/aarch64 + - name: Create orig.tar.gz with common/ libs/ mods/ jmods/ run: | mkdir pkgdir cp -r target/libs pkgdir cp -r target/mods pkgdir + cp -r jmods pkgdir cp -r dist/linux/common/ pkgdir cp target/cryptomator-*.jar pkgdir/mods tar -cJf cryptomator_${{ steps.versions.outputs.ppaVerStr }}.orig.tar.xz -C pkgdir . diff --git a/dist/linux/debian/rules b/dist/linux/debian/rules index 04c256f60..37243040a 100755 --- a/dist/linux/debian/rules +++ b/dist/linux/debian/rules @@ -20,6 +20,7 @@ override_dh_auto_build: ln -s ../common/org.cryptomator.Cryptomator512.png resources/cryptomator.png $(JAVA_HOME)/bin/jlink \ --output runtime \ + --module-path "jmods:${JAVA_HOME}/jmods" \ --add-modules java.base,java.desktop,java.instrument,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,jdk.unsupported,jdk.crypto.ec,jdk.accessibility,jdk.management.jfr \ --strip-native-commands \ --no-header-files \