Skip to content

Commit

Permalink
Merge branch 'release/1.12.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
infeo committed Feb 9, 2024
2 parents a8af3c8 + 0421879 commit c07e51b
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 4 deletions.
20 changes: 19 additions & 1 deletion .github/workflows/win-exe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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 <https://github.com/${{ github.repository }}/actions/workflows/winget.yml| release to winget>."
SLACK_FOOTER: false
MSG_MINIMAL: true
27 changes: 27 additions & 0 deletions .github/workflows/winget.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Publish MSI to winget-pkgs

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 repo sync cryptomator/winget-pkgs -b master --force
env:
GH_TOKEN: ${{ secrets.CRYPTOBOT_WINGET_TOKEN }}
- name: Submit package
uses: vedantmgoyal2009/winget-releaser@v2
with:
identifier: Cryptomator.Cryptomator
version: ${{ inputs.tag }}
release-tag: ${{ inputs.tag }}
installers-regex: '\.msi$'
token: ${{ secrets.CRYPTOBOT_WINGET_TOKEN }}
1 change: 1 addition & 0 deletions dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
</content_rating>

<releases>
<release date="2024-02-09" version="1.12.2"/>
<release date="2024-02-07" version="1.12.1"/>
<release date="2024-02-06" version="1.12.0"/>
<release date="2023-12-05" version="1.11.1"/>
Expand Down
2 changes: 1 addition & 1 deletion dist/win/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.cryptomator</groupId>
<artifactId>cryptomator</artifactId>
<version>1.12.1</version>
<version>1.12.2</version>
<name>Cryptomator Desktop App</name>

<organization>
Expand Down Expand Up @@ -37,7 +37,7 @@
<cryptomator.integrations.version>1.3.0</cryptomator.integrations.version>
<cryptomator.integrations.win.version>1.2.5</cryptomator.integrations.win.version>
<cryptomator.integrations.mac.version>1.2.3</cryptomator.integrations.mac.version>
<cryptomator.integrations.linux.version>1.4.3</cryptomator.integrations.linux.version>
<cryptomator.integrations.linux.version>1.4.4</cryptomator.integrations.linux.version>
<cryptomator.fuse.version>4.0.0</cryptomator.fuse.version>
<cryptomator.dokany.version>2.0.0</cryptomator.dokany.version>
<cryptomator.webdav.version>2.0.6</cryptomator.webdav.version>
Expand Down

0 comments on commit c07e51b

Please sign in to comment.