From ba0569deb137d22fe3ead09aa2452d84fedf74a2 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Thu, 17 Nov 2022 09:59:38 +0100 Subject: [PATCH 01/10] preparing 1.7.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 725e3d7c2..d7f286126 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.cryptomator cryptomator - 1.7.0-SNAPSHOT + 1.7.0 Cryptomator Desktop App From 6e526ba796e8094fc1f5563e76229879d740e5f1 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Fri, 25 Nov 2022 14:47:07 +0100 Subject: [PATCH 02/10] draft release --- 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 453a5f9d0..4360cc75b 100644 --- a/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml +++ b/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml @@ -66,6 +66,7 @@ + From db4d845a5bc6483b232d65f2794fde5da85f230c Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Fri, 9 Dec 2022 16:41:31 +0100 Subject: [PATCH 03/10] adjust matching rules for version type detection (cherry picked from commit cd358916260e713d4119c20b1bcb5b448a017365) (cherry picked from commit 433eecc6a81ef093c7783f58384f51c78ef2ac27) --- .github/workflows/get-version.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/get-version.yml b/.github/workflows/get-version.yml index e6131b835..5cffb56fb 100644 --- a/.github/workflows/get-version.yml +++ b/.github/workflows/get-version.yml @@ -58,13 +58,13 @@ jobs: SEM_VER_NUM=`echo ${SEM_VER_STR} | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+).*/\1/'` REVCOUNT=`git rev-list --count HEAD` TYPE="unknown" - if [[ $SEM_VER_STR =~ [0-9]+\.[0-9]+\.[0-9]+ ]]; then + if [[ $SEM_VER_STR =~ [0-9]+\.[0-9]+\.[0-9]+$ ]]; then TYPE="stable" - elif [[ $SEM_VER_STR =~ [0-9]+\.[0-9]+\.[0-9]+-alpha[1-9] ]]; then + elif [[ $SEM_VER_STR =~ [0-9]+\.[0-9]+\.[0-9]+-alpha[1-9]+$ ]]; then TYPE="alpha" - elif [[ $SEM_VER_STR =~ [0-9]+\.[0-9]+\.[0-9]+-beta[1-9] ]]; then + elif [[ $SEM_VER_STR =~ [0-9]+\.[0-9]+\.[0-9]+-beta[1-9]+$ ]]; then TYPE="beta" - elif [[ $SEM_VER_STR =~ [0-9]+\.[0-9]+\.[0-9]+-rc[1-9] ]]; then + elif [[ $SEM_VER_STR =~ [0-9]+\.[0-9]+\.[0-9]+-rc[1-9]$ ]]; then TYPE="rc" fi echo "semVerStr=${SEM_VER_STR}" >> $GITHUB_OUTPUT From 1a358f06e85b74b5ea61fc5ee5884e6eb4064919 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Fri, 9 Dec 2022 16:56:02 +0100 Subject: [PATCH 04/10] revert 0725a63b09922ec5dafd3ecd5c4953fedb023f25 and fix workflow (cherry picked from commit 9dfd8adcced223b5c104c58a8059f5c4bea17124) --- .github/workflows/win-exe.yml | 22 +++++++++------------- .github/workflows/winget.yml | 5 +++++ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index 37b99e7de..a20f58d44 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -197,6 +197,15 @@ jobs: *.msi *.asc + call-winget-flow: + needs: [get-version, build-msi] + if: github.event.action == 'published' && needs.get-version.outputs.versionType == 'stable' + uses: ./.github/workflows/winget.yml + with: + releaseTag: ${{ github.event.release.tag_name }} + secrets: inherit + + build-exe: name: Build .exe installer runs-on: windows-latest @@ -301,19 +310,6 @@ jobs: files: | Cryptomator-*.exe Cryptomator-*.asc - - name: Slack Notification - if: ${{ needs.get-version.outputs.versionType == 'stable' }} - uses: rtCamp/action-slack-notify@v2 - env: - SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }} - SLACK_USERNAME: 'Cryptobot' - SLACK_ICON: false - SLACK_ICON_EMOJI: ':bot:' - SLACK_CHANNEL: 'cryptomator-desktop' - SLACK_TITLE: "Windows build of ${{ github.event.repository.name }} ${{ github.event.release.tag_name }} finished." - SLACK_MESSAGE: "Ready to ." - SLACK_FOOTER: false - MSG_MINIMAL: true allowlist: name: Anti Virus Allowlisting diff --git a/.github/workflows/winget.yml b/.github/workflows/winget.yml index 6d1475ef7..632b02de5 100644 --- a/.github/workflows/winget.yml +++ b/.github/workflows/winget.yml @@ -1,6 +1,11 @@ name: Release to Winget on: + workflow_call: + inputs: + releaseTag: + required: true + type: string workflow_dispatch: inputs: releaseTag: From 76689705f58a9807768017ae9997f63f011b7f2e Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 12 Dec 2022 08:54:18 +0100 Subject: [PATCH 05/10] remove LD_PRELOAD workaround, which should no longer be required with jfuse --- dist/linux/debian/cryptomator.install | 1 - dist/linux/debian/cryptomator.links | 2 +- dist/linux/debian/cryptomator.sh | 6 ------ 3 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 dist/linux/debian/cryptomator.sh diff --git a/dist/linux/debian/cryptomator.install b/dist/linux/debian/cryptomator.install index d3ff8cf1f..62a1f3f15 100644 --- a/dist/linux/debian/cryptomator.install +++ b/dist/linux/debian/cryptomator.install @@ -1,5 +1,4 @@ cryptomator usr/lib -debian/cryptomator.sh usr/lib/cryptomator/bin common/org.cryptomator.Cryptomator.desktop usr/share/applications common/org.cryptomator.Cryptomator.svg usr/share/icons/hicolor/scalable/apps common/org.cryptomator.Cryptomator256.png usr/share/icons/hicolor/256x256/apps diff --git a/dist/linux/debian/cryptomator.links b/dist/linux/debian/cryptomator.links index 8cc4cd0d4..12e37bd0a 100644 --- a/dist/linux/debian/cryptomator.links +++ b/dist/linux/debian/cryptomator.links @@ -1 +1 @@ -usr/lib/cryptomator/bin/cryptomator.sh usr/bin/cryptomator +usr/lib/cryptomator/bin/cryptomator usr/bin/cryptomator diff --git a/dist/linux/debian/cryptomator.sh b/dist/linux/debian/cryptomator.sh deleted file mode 100644 index 0d6453962..000000000 --- a/dist/linux/debian/cryptomator.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -# fix for https://github.com/cryptomator/cryptomator/issues/1370 -export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/jni/libjffi-1.2.so - -/usr/lib/cryptomator/bin/cryptomator $@ \ No newline at end of file From ffaf7ad3600bbcdf37b07c984cadbd5689ba50f9 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 12 Dec 2022 09:03:56 +0100 Subject: [PATCH 06/10] adjust package dependencies to new mount api and jfuse --- dist/linux/debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/linux/debian/control b/dist/linux/debian/control index b17454f40..dd4809950 100644 --- a/dist/linux/debian/control +++ b/dist/linux/debian/control @@ -12,7 +12,7 @@ Package: cryptomator Architecture: any Section: utils Priority: optional -Depends: ${shlibs:Depends}, ${misc:Depends}, libfuse2, xdg-utils, libjffi-jni +Depends: ${shlibs:Depends}, ${misc:Depends}, libfuse3-3 Recommends: gvfs-backends, gvfs-fuse, gnome-keyring XB-AppName: Cryptomator XB-Category: Utility;Security;FileTools; From 4fda4a2b2e554aa46d09575bceec9cc3f9553401 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 12 Dec 2022 09:09:25 +0100 Subject: [PATCH 07/10] fix makefile --- dist/linux/debian/rules | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dist/linux/debian/rules b/dist/linux/debian/rules index 06372a008..e35dbb0a7 100755 --- a/dist/linux/debian/rules +++ b/dist/linux/debian/rules @@ -60,10 +60,3 @@ override_dh_auto_build: --app-version "${VERSION_NUM}.${REVISION_NUM}" \ --resource-dir resources \ --verbose - -override_dh_fixperms: - dh_fixperms - chmod +x debian/cryptomator/usr/lib/cryptomator/bin/cryptomator.sh - -# override_dh_strip: - # no-op From ebad677e84cec65d84d6397853c4e42d9d441aa7 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 12 Dec 2022 09:14:24 +0100 Subject: [PATCH 08/10] fix path to downloaded jmod files --- .github/workflows/debian.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index 10bec996d..178d6ce96 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -65,10 +65,10 @@ jobs: unzip -j openjfx-aarch64.zip \*/javafx.base.jmod \*/javafx.controls.jmod \*/javafx.fxml.jmod \*/javafx.graphics.jmod -d jmods/aarch64 - name: Ensure major jfx version in pom and in jmods is the same run: | - JMOD_VERSION_AMD64=$(jmod describe ${JAVA_HOME}/jmods/amd64/javafx.base.jmod | head -1) + JMOD_VERSION_AMD64=$(jmod describe jmods/amd64/javafx.base.jmod | head -1) JMOD_VERSION_AMD64=${JMOD_VERSION_AMD64#*@} JMOD_VERSION_AMD64=${JMOD_VERSION_AMD64%%.*} - JMOD_VERSION_AARCH64=$(jmod describe ${JAVA_HOME}/jmods/aarch64/javafx.base.jmod | head -1) + JMOD_VERSION_AARCH64=$(jmod describe jmods/aarch64/javafx.base.jmod | head -1) JMOD_VERSION_AARCH64=${JMOD_VERSION_AARCH64#*@} JMOD_VERSION_AARCH64=${JMOD_VERSION_AARCH64%%.*} POM_JFX_VERSION=$(mvn help:evaluate "-Dexpression=javafx.version" -q -DforceStdout) From 74718754ad126228168705e80afb24ac818c385c Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Thu, 26 Jan 2023 13:48:30 +0100 Subject: [PATCH 09/10] fix merge --- dist/linux/appimage/build.sh | 2 ++ dist/linux/debian/rules | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dist/linux/appimage/build.sh b/dist/linux/appimage/build.sh index 7fc9f04a8..a98529bc7 100755 --- a/dist/linux/appimage/build.sh +++ b/dist/linux/appimage/build.sh @@ -43,6 +43,8 @@ ${JAVA_HOME}/bin/jpackage \ --dest appdir \ --name Cryptomator \ --vendor "Skymatic GmbH" \ + --java-options "--enable-preview" \ + --java-options "--enable-native-access=org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64" \ --copyright "(C) 2016 - 2023 Skymatic GmbH" \ --java-options "-Xss5m" \ --java-options "-Xmx256m" \ diff --git a/dist/linux/debian/rules b/dist/linux/debian/rules index ec82dea47..be1014ea9 100755 --- a/dist/linux/debian/rules +++ b/dist/linux/debian/rules @@ -42,6 +42,8 @@ override_dh_auto_build: --dest . \ --name cryptomator \ --vendor "Skymatic GmbH" \ + --java-options "--enable-preview" \ + --java-options "--enable-native-access=org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64" \ --copyright "(C) 2016 - 2023 Skymatic GmbH" \ --java-options "-Xss5m" \ --java-options "-Xmx256m" \ From f4c4f725396ce39851820cf282a6aac8fbe2a5d0 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Thu, 26 Jan 2023 14:31:23 +0100 Subject: [PATCH 10/10] remove libjffi stuff from appimage --- .github/workflows/appimage.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 8698d58ab..c69a460f1 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -111,12 +111,6 @@ jobs: ln -s usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg Cryptomator.AppDir/.DirIcon ln -s usr/share/applications/org.cryptomator.Cryptomator.desktop Cryptomator.AppDir/Cryptomator.desktop ln -s bin/cryptomator.sh Cryptomator.AppDir/AppRun - - name: Extract libjffi.so # workaround for https://github.com/cryptomator/cryptomator-linux/issues/27 - run: | - JFFI_NATIVE_JAR=`ls lib/app/ | grep -e 'jffi-[1-9]\.[0-9]\{1,2\}.[0-9]\{1,2\}-native.jar'` - ${JAVA_HOME}/bin/jar -xf lib/app/${JFFI_NATIVE_JAR} /jni/x86_64-Linux/ - mv jni/x86_64-Linux/* lib/app/libjffi.so - working-directory: Cryptomator.AppDir - name: Download AppImageKit run: | curl -L https://github.com/AppImage/AppImageKit/releases/download/13/appimagetool-x86_64.AppImage -o appimagetool.AppImage