From ef4738f92048a43f3a84dfb47738d229173fd367 Mon Sep 17 00:00:00 2001 From: Julian Raufelder Date: Fri, 11 Aug 2023 15:52:42 +0200 Subject: [PATCH 1/3] Use latest version of Java to avoid using an out of date version when building the release See https://github.com/actions/setup-java/tree/main#check-latest for further information --- .github/workflows/appimage.yml | 1 + .github/workflows/debian.yml | 1 + .github/workflows/mac-dmg.yml | 1 + .github/workflows/win-exe.yml | 2 ++ 4 files changed, 5 insertions(+) diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index f966f6b22..f3cf6ae37 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -30,6 +30,7 @@ jobs: distribution: 'zulu' java-version: ${{ env.JAVA_VERSION }} java-package: 'jdk+fx' + check-latest: true cache: 'maven' - name: Ensure major jfx version in pom equals in jdk shell: pwsh diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index bd353a434..edbaa138b 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -51,6 +51,7 @@ jobs: with: distribution: 'zulu' java-version: ${{ env.JAVA_VERSION }} + check-latest: true cache: 'maven' - name: Run maven run: mvn -B clean package -Pdependency-check,linux -DskipTests diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index bad80138b..155701c89 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -45,6 +45,7 @@ jobs: java-version: ${{ env.JAVA_VERSION }} java-package: 'jdk+fx' architecture: ${{ matrix.architecture }} + check-latest: true cache: 'maven' - name: Ensure major jfx version in pom equals in jdk if: ${{ !contains(matrix.os, 'self-hosted') }} diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index df67c1dcb..b0190c30e 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -45,6 +45,7 @@ jobs: distribution: ${{ env.JAVA_DIST }} java-version: ${{ env.JAVA_VERSION }} java-package: 'jdk' + check-latest: true cache: ${{ env.JAVA_CACHE }} - name: Download and extract JavaFX jmods from Gluon #In the last step we move all jmods files a dir level up because jmods are placed inside a directory in the zip @@ -246,6 +247,7 @@ jobs: with: distribution: ${{ env.JAVA_DIST }} java-version: ${{ env.JAVA_VERSION }} + check-latest: true cache: ${{ env.JAVA_CACHE }} - name: Generate license for exe run: > From 261f2da105b550dcbe201ca166437b90c3342ae5 Mon Sep 17 00:00:00 2001 From: Julian Raufelder Date: Fri, 11 Aug 2023 15:53:26 +0200 Subject: [PATCH 2/3] Prepare 1.9.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ed07c2287..b4a12812e 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.cryptomator cryptomator - 1.9.3 + 1.9.4 Cryptomator Desktop App From e5f0aca477c729d08e89ea46d63f428069ef71fc Mon Sep 17 00:00:00 2001 From: Julian Raufelder Date: Fri, 11 Aug 2023 15:54:50 +0200 Subject: [PATCH 3/3] Finalize 1.9.4 --- dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml b/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml index 0ca6499ad..f1deff111 100644 --- a/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml +++ b/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml @@ -66,6 +66,7 @@ +