From 42d3dbaa23da27d536f3d18f59715e2c3d37c124 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Thu, 8 Feb 2024 17:10:40 +0100 Subject: [PATCH 1/8] always use latest version of winfsp-uninstaller --- .github/workflows/win-exe.yml | 2 +- dist/win/build.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index 3eb11bf3b..0461ab801 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -19,7 +19,7 @@ env: OPENJFX_JMODS_AMD64: 'https://download2.gluonhq.com/openjfx/21.0.1/openjfx-21.0.1_windows-x64_bin-jmods.zip' OPENJFX_JMODS_AMD64_HASH: 'daf8acae631c016c24cfe23f88469400274d3441dd890615a42dfb501f3eb94a' WINFSP_MSI: 'https://github.com/winfsp/winfsp/releases/download/v2.0/winfsp-2.0.23075.msi' - WINFSP_UNINSTALLER: 'https://github.com/cryptomator/winfsp-uninstaller/releases/download/1.0.0/winfsp-uninstaller.exe' + WINFSP_UNINSTALLER: 'https://github.com/cryptomator/winfsp-uninstaller/releases/latest/download/winfsp-uninstaller.exe' defaults: run: diff --git a/dist/win/build.ps1 b/dist/win/build.ps1 index 7b1f7cc47..d48f2bce3 100644 --- a/dist/win/build.ps1 +++ b/dist/win/build.ps1 @@ -181,7 +181,7 @@ Write-Output "Downloading ${winfspMsiUrl}..." Invoke-WebRequest $winfspMsiUrl -OutFile ".\bundle\resources\winfsp.msi" # redirects are followed by default # download legacy-winfsp uninstaller -$winfspUninstaller= 'https://github.com/cryptomator/winfsp-uninstaller/releases/download/1.0.0/winfsp-uninstaller.exe' +$winfspUninstaller= 'https://github.com/cryptomator/winfsp-uninstaller/releases/latest/download/winfsp-uninstaller.exe' Write-Output "Downloading ${winfspUninstaller}..." Invoke-WebRequest $winfspUninstaller -OutFile ".\bundle\resources\winfsp-uninstaller.exe" # redirects are followed by default From e1cca6427c4c1506499c5af940e1919ad6ac23be Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Thu, 8 Feb 2024 17:34:02 +0100 Subject: [PATCH 2/8] Add ci job for releasing to winget --- .github/workflows/win-exe.yml | 18 ++++++++++++++++++ .github/workflows/winget.yml | 27 +++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 .github/workflows/winget.yml diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index 0461ab801..0ca2a7789 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -413,3 +413,21 @@ jobs: username: ${{ secrets.ALLOWLIST_AVAST_USERNAME }} password: ${{ secrets.ALLOWLIST_AVAST_PASSWORD }} local-dir: files/ + notify-winget: + name: Notify for winget-release + if: startsWith(github.ref, 'refs/tags/') + needs: [build-msi] + runs-on: ubuntu-latest + steps: + - name: Slack Notification + 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: "MSI of ${{ github.event.repository.name }} ${{ github.event.release.tag_name }} published." + SLACK_MESSAGE: "Ready to ." + SLACK_FOOTER: false + MSG_MINIMAL: true \ No newline at end of file diff --git a/.github/workflows/winget.yml b/.github/workflows/winget.yml new file mode 100644 index 000000000..a527e7398 --- /dev/null +++ b/.github/workflows/winget.yml @@ -0,0 +1,27 @@ +name: Publish MSI Installer to WinGet Community Repo + +on: + workflow_dispatch: + inputs: + tag: + description: 'Release tag' + required: true + +jobs: + winget: + name: Publish winget package + runs-on: windows-latest + steps: + - name: Sync winget-pkgs fork + run: | + gh auth login --with-token $env:SYNC_TOKEN + gh repo sync cryptomator/winget-pkgs -b master --force + env: + SYNC_TOKEN: ${{ secrets.CRYPTOBOT_WINGET_TOKEN }} + - name: Submit package + uses: vedantmgoyal2009/winget-releaser@v2 + with: + identifier: Cryptomator.Cryptomator + release-tag: ${{ inputs.tag }} + installers-regex: '\.msi$' + token: ${{ secrets.CRYPTOBOT_WINGET_TOKEN }} \ No newline at end of file From 42dd2fba486485d5f9ff8390122773389f846847 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Thu, 8 Feb 2024 17:37:35 +0100 Subject: [PATCH 3/8] github cli needs special token in CI env [ci skip] --- .github/workflows/winget.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/winget.yml b/.github/workflows/winget.yml index a527e7398..3a8e9c548 100644 --- a/.github/workflows/winget.yml +++ b/.github/workflows/winget.yml @@ -14,10 +14,9 @@ jobs: steps: - name: Sync winget-pkgs fork run: | - gh auth login --with-token $env:SYNC_TOKEN gh repo sync cryptomator/winget-pkgs -b master --force env: - SYNC_TOKEN: ${{ secrets.CRYPTOBOT_WINGET_TOKEN }} + GH_TOKEN: ${{ secrets.CRYPTOBOT_WINGET_TOKEN }} - name: Submit package uses: vedantmgoyal2009/winget-releaser@v2 with: From 17335e8f701b465c91b95316b5fbb7632f2acdca Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Thu, 8 Feb 2024 17:39:21 +0100 Subject: [PATCH 4/8] shorten workflow name [ci skip] --- .github/workflows/winget.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/winget.yml b/.github/workflows/winget.yml index 3a8e9c548..c8c1e6e3d 100644 --- a/.github/workflows/winget.yml +++ b/.github/workflows/winget.yml @@ -1,4 +1,4 @@ -name: Publish MSI Installer to WinGet Community Repo +name: Publish MSI to winget-pkgs on: workflow_dispatch: From a5e36303754a5d99f350ca3d624212a7f271a12b Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Thu, 8 Feb 2024 17:47:50 +0100 Subject: [PATCH 5/8] also specify version for winget release [ci skip] --- .github/workflows/winget.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/winget.yml b/.github/workflows/winget.yml index c8c1e6e3d..245eff5d4 100644 --- a/.github/workflows/winget.yml +++ b/.github/workflows/winget.yml @@ -21,6 +21,7 @@ jobs: uses: vedantmgoyal2009/winget-releaser@v2 with: identifier: Cryptomator.Cryptomator + version: ${{ inputs.tag }} release-tag: ${{ inputs.tag }} installers-regex: '\.msi$' token: ${{ secrets.CRYPTOBOT_WINGET_TOKEN }} \ No newline at end of file From dc0e88a694adb38cb1c2a0d845887c66d5f20210 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Fri, 9 Feb 2024 10:55:27 +0100 Subject: [PATCH 6/8] fixes #3319 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6d5418a92..3ee727579 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ 1.3.0 1.2.5 1.2.3 - 1.4.3 + 1.4.4 4.0.0 2.0.0 2.0.6 From 2d627717a04c310a40f62174f401e581e38fb232 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Fri, 9 Feb 2024 10:59:33 +0100 Subject: [PATCH 7/8] prepare 1.12.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3ee727579..3e6d37bee 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.cryptomator cryptomator - 1.13.0-SNAPSHOT + 1.12.2 Cryptomator Desktop App From 0421879b39702953989de4cf3986ba9cbbe8daf3 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Fri, 9 Feb 2024 12:51:19 +0100 Subject: [PATCH 8/8] finalize 1.12.2 --- 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 98316a892..0330cac11 100644 --- a/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml +++ b/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml @@ -66,6 +66,7 @@ +