Compare commits

...
Author SHA1 Message Date
Armin Schrenk 1b9f847fd4 [skip ci] update changelog 2026-09-16 17:57:35 +02:00
Tobias Hagemann 1712d31a5c Scope draft release permissions 2026-09-15 21:26:02 +02:00
Tobias Hagemann 8d732e19ce Harden workflow permissions 2026-09-15 21:20:31 +02:00
Armin Schrenk 264e1590c2 fix license generation plugin 2026-09-15 18:44:48 +02:00
25 changed files with 92 additions and 16 deletions
+3
View File
@@ -48,6 +48,9 @@ on:
- 'dist/linux/common/**' - 'dist/linux/common/**'
- 'dist/linux/resources/**' - 'dist/linux/resources/**'
permissions:
contents: read
env: env:
JAVA_DIST: 'temurin' JAVA_DIST: 'temurin'
JAVA_VERSION: '26.0.1+8' JAVA_VERSION: '26.0.1+8'
+3
View File
@@ -9,6 +9,9 @@ on:
description: 'Source or Release tag' description: 'Source or Release tag'
required: false required: false
permissions:
contents: read
jobs: jobs:
get-version: get-version:
uses: ./.github/workflows/get-version.yml uses: ./.github/workflows/get-version.yml
+2
View File
@@ -34,6 +34,8 @@ on:
type: boolean type: boolean
default: false default: false
permissions: {}
jobs: jobs:
download-file: download-file:
name: Downloads the file into the VM name: Downloads the file into the VM
+4
View File
@@ -17,6 +17,10 @@ defaults:
run: run:
shell: bash shell: bash
permissions:
contents: read
pull-requests: read
jobs: jobs:
test: test:
name: Compile and Test name: Compile and Test
+2
View File
@@ -15,6 +15,8 @@ env:
} }
} }
permissions: {}
jobs: jobs:
check-version: check-version:
name: Checkout latest jdk version name: Checkout latest jdk version
+3
View File
@@ -32,6 +32,9 @@ env:
OPENJFX_JMODS_AARCH64: 'https://download2.gluonhq.com/openjfx/25.0.3/openjfx-25.0.3_linux-aarch64_bin-jmods.zip' OPENJFX_JMODS_AARCH64: 'https://download2.gluonhq.com/openjfx/25.0.3/openjfx-25.0.3_linux-aarch64_bin-jmods.zip'
OPENJFX_JMODS_AARCH64_HASH: 'e3fd682354346845d2944a2da2b1ff2b6cb9259d92027f2f9c121b9b93c5e42f' OPENJFX_JMODS_AARCH64_HASH: 'e3fd682354346845d2944a2da2b1ff2b6cb9259d92027f2f9c121b9b93c5e42f'
permissions:
contents: read
jobs: jobs:
get-version: get-version:
uses: ./.github/workflows/get-version.yml uses: ./.github/workflows/get-version.yml
+3
View File
@@ -5,6 +5,9 @@ on:
workflow_dispatch: workflow_dispatch:
permissions:
contents: read
jobs: jobs:
check-dependencies: check-dependencies:
uses: skymatic/workflows/.github/workflows/run-dependency-check.yml@8356563bf7b8d1c8d693f75ca487e8f57573cec9 # v3.1.0 uses: skymatic/workflows/.github/workflows/run-dependency-check.yml@8356563bf7b8d1c8d693f75ca487e8f57573cec9 # v3.1.0
+3
View File
@@ -4,6 +4,9 @@ on:
schedule: schedule:
- cron: '0/15 * * * *' # run every 15 min - don't forget to adjust the "interval" in the json sent to the metrics endpoint - cron: '0/15 * * * *' # run every 15 min - don't forget to adjust the "interval" in the json sent to the metrics endpoint
permissions:
contents: read
jobs: jobs:
report-download-stats: report-download-stats:
runs-on: ubuntu-latest runs-on: ubuntu-latest
+15
View File
@@ -16,6 +16,8 @@ defaults:
jobs: jobs:
get-version: get-version:
uses: ./.github/workflows/get-version.yml uses: ./.github/workflows/get-version.yml
permissions:
contents: read
with: with:
version: '' version: ''
@@ -23,6 +25,9 @@ jobs:
name: Compile and Test name: Compile and Test
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: get-version needs: get-version
permissions:
contents: read
pull-requests: read
if: needs.get-version.outputs.versionType != 'unknown' if: needs.get-version.outputs.versionType != 'unknown'
steps: steps:
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
@@ -71,6 +76,8 @@ jobs:
build-exe-and-msi: build-exe-and-msi:
needs: [get-version, create-release-draft] needs: [get-version, create-release-draft]
uses: ./.github/workflows/win-exe.yml uses: ./.github/workflows/win-exe.yml
permissions:
contents: read
with: with:
semVerNum: ${{needs.get-version.outputs.semVerNum}} semVerNum: ${{needs.get-version.outputs.semVerNum}}
revisionNum: ${{needs.get-version.outputs.revNum}} revisionNum: ${{needs.get-version.outputs.revNum}}
@@ -80,6 +87,8 @@ jobs:
build-dmg-arm64: build-dmg-arm64:
needs: [get-version, create-release-draft] needs: [get-version, create-release-draft]
uses: ./.github/workflows/mac-dmg.yml uses: ./.github/workflows/mac-dmg.yml
permissions:
contents: read
with: with:
semVerNum: ${{needs.get-version.outputs.semVerNum}} semVerNum: ${{needs.get-version.outputs.semVerNum}}
revisionNum: ${{needs.get-version.outputs.revNum}} revisionNum: ${{needs.get-version.outputs.revNum}}
@@ -89,6 +98,8 @@ jobs:
build-dmg-x64: build-dmg-x64:
needs: [get-version, create-release-draft] needs: [get-version, create-release-draft]
uses: ./.github/workflows/mac-dmg-x64.yml uses: ./.github/workflows/mac-dmg-x64.yml
permissions:
contents: read
with: with:
semVerNum: ${{needs.get-version.outputs.semVerNum}} semVerNum: ${{needs.get-version.outputs.semVerNum}}
revisionNum: ${{needs.get-version.outputs.revNum}} revisionNum: ${{needs.get-version.outputs.revNum}}
@@ -98,6 +109,8 @@ jobs:
build-appimages: build-appimages:
needs: [get-version, create-release-draft] needs: [get-version, create-release-draft]
uses: ./.github/workflows/appimage.yml uses: ./.github/workflows/appimage.yml
permissions:
contents: read
with: with:
semVerNum: ${{needs.get-version.outputs.semVerNum}} semVerNum: ${{needs.get-version.outputs.semVerNum}}
revisionNum: ${{needs.get-version.outputs.revNum}} revisionNum: ${{needs.get-version.outputs.revNum}}
@@ -107,6 +120,8 @@ jobs:
update-sha256sums: update-sha256sums:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: [get-version, build-exe-and-msi, build-dmg-arm64, build-dmg-x64, build-appimages] needs: [get-version, build-exe-and-msi, build-dmg-arm64, build-dmg-x64, build-appimages]
permissions:
contents: read
env: env:
TAG: ${{ github.ref_name }} TAG: ${{ github.ref_name }}
SEMVER: ${{ needs.get-version.outputs.semVerStr }} SEMVER: ${{ needs.get-version.outputs.semVerStr }}
+3
View File
@@ -6,6 +6,9 @@ on:
discussion_comment: discussion_comment:
types: [created, edited, deleted] types: [created, edited, deleted]
permissions:
discussions: read
jobs: jobs:
update-error-db: update-error-db:
runs-on: ubuntu-latest runs-on: ubuntu-latest
+3
View File
@@ -28,6 +28,9 @@ env:
JAVA_DIST: 'temurin' JAVA_DIST: 'temurin'
JAVA_VERSION: 26 JAVA_VERSION: 26
permissions:
contents: read
jobs: jobs:
determine-version: determine-version:
name: 'Determines the version following semver' name: 'Determines the version following semver'
+3
View File
@@ -23,6 +23,9 @@ on:
- 'dist/linux/common/**' - 'dist/linux/common/**'
- 'dist/linux/resources/**' - 'dist/linux/resources/**'
permissions:
contents: read
jobs: jobs:
get-version: get-version:
uses: ./.github/workflows/get-version.yml uses: ./.github/workflows/get-version.yml
+3
View File
@@ -23,6 +23,9 @@ on:
- 'dist/linux/common/**' - 'dist/linux/common/**'
- 'dist/linux/resources/**' - 'dist/linux/resources/**'
permissions:
contents: read
jobs: jobs:
get-version: get-version:
uses: ./.github/workflows/get-version.yml uses: ./.github/workflows/get-version.yml
+3 -1
View File
@@ -62,6 +62,9 @@ env:
VERSION_SUFFIX: ${{ inputs.semVerSuffix || ''}} VERSION_SUFFIX: ${{ inputs.semVerSuffix || ''}}
permissions:
contents: read
jobs: jobs:
build: build:
name: Build Cryptomator.app for ${{ matrix.output-suffix }} name: Build Cryptomator.app for ${{ matrix.output-suffix }}
@@ -192,7 +195,6 @@ jobs:
-Dlicense.includedScopes=compile -Dlicense.includedScopes=compile
-Dlicense.excludedGroups=^org\.cryptomator -Dlicense.excludedGroups=^org\.cryptomator
-Dlicense.failOnMissing=true -Dlicense.failOnMissing=true
-Dlicense.licenseMergesUrl=file://${{ github.workspace }}/license/merges
- name: Install codesign certificate - name: Install codesign certificate
run: | run: |
# create variables # create variables
+3 -1
View File
@@ -60,6 +60,9 @@ env:
VERSION_SUFFIX: ${{ inputs.semVerSuffix || ''}} VERSION_SUFFIX: ${{ inputs.semVerSuffix || ''}}
permissions:
contents: read
jobs: jobs:
build: build:
name: Build Cryptomator.app for ${{ matrix.output-suffix }} name: Build Cryptomator.app for ${{ matrix.output-suffix }}
@@ -191,7 +194,6 @@ jobs:
-Dlicense.includedScopes=compile -Dlicense.includedScopes=compile
-Dlicense.excludedGroups=^org\.cryptomator -Dlicense.excludedGroups=^org\.cryptomator
-Dlicense.failOnMissing=true -Dlicense.failOnMissing=true
-Dlicense.licenseMergesUrl=file://${{ github.workspace }}/license/merges
- name: Install codesign certificate - name: Install codesign certificate
run: | run: |
# create variables # create variables
+2 -1
View File
@@ -4,6 +4,8 @@ on:
release: release:
types: [published] types: [published]
permissions: {}
jobs: jobs:
notify: notify:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@@ -142,4 +144,3 @@ jobs:
token: ${{ secrets.CRYPTOBOT_WORKFLOW_DISPATCH_TOKEN }} token: ${{ secrets.CRYPTOBOT_WORKFLOW_DISPATCH_TOKEN }}
repository: cryptomator/docs repository: cryptomator/docs
client-payload: '{ "version": "${{ github.event.release.tag_name }}", "release": ${{ toJson(github.event.release.assets) }} }' client-payload: '{ "version": "${{ github.event.release.tag_name }}", "release": ${{ toJson(github.event.release.assets) }} }'
+3
View File
@@ -11,6 +11,9 @@ defaults:
run: run:
shell: bash shell: bash
permissions:
contents: read
jobs: jobs:
test: test:
name: Compile and Test name: Compile and Test
+3
View File
@@ -14,6 +14,9 @@ env:
JAVA_DIST: 'temurin' JAVA_DIST: 'temurin'
JAVA_VERSION: 26 JAVA_VERSION: 26
permissions:
contents: read
jobs: jobs:
check-preconditions: check-preconditions:
name: Validate commits pushed to release/hotfix branch to fulfill release requirements name: Validate commits pushed to release/hotfix branch to fulfill release requirements
+3 -2
View File
@@ -71,6 +71,9 @@ defaults:
run: run:
shell: bash shell: bash
permissions:
contents: read
jobs: jobs:
build-msi: build-msi:
name: Build .msi Installer name: Build .msi Installer
@@ -269,7 +272,6 @@ jobs:
"-Dlicense.includedScopes=compile" "-Dlicense.includedScopes=compile"
"-Dlicense.excludedGroups=^org\.cryptomator" "-Dlicense.excludedGroups=^org\.cryptomator"
"-Dlicense.failOnMissing=true" "-Dlicense.failOnMissing=true"
"-Dlicense.licenseMergesUrl=file:///${{ github.workspace }}/license/merges"
shell: pwsh shell: pwsh
- name: Create file association file from template - name: Create file association file from template
working-directory: dist/win working-directory: dist/win
@@ -384,7 +386,6 @@ jobs:
"-Dlicense.includedScopes=compile" "-Dlicense.includedScopes=compile"
"-Dlicense.excludedGroups=^org\.cryptomator" "-Dlicense.excludedGroups=^org\.cryptomator"
"-Dlicense.failOnMissing=true" "-Dlicense.failOnMissing=true"
"-Dlicense.licenseMergesUrl=file:///${{ github.workspace }}/license/merges"
shell: pwsh shell: pwsh
- name: Download WinFsp - name: Download WinFsp
run: | run: |
+2
View File
@@ -7,6 +7,8 @@ on:
description: 'Release tag' description: 'Release tag'
required: true required: true
permissions: {}
jobs: jobs:
winget: winget:
name: Publish winget package name: Publish winget package
+15 -2
View File
@@ -9,8 +9,17 @@ Changes to prior versions can be found on the [Github release page](https://gith
## [Unreleased](https://github.com/cryptomator/cryptomator/compare/1.19.3...HEAD) ## [Unreleased](https://github.com/cryptomator/cryptomator/compare/1.19.3...HEAD)
### Fixed
* Fixed "Locate encrypted file" opening the file instead of revealing it in the file manager on Linux ([#4272](https://github.com/cryptomator/cryptomator/issues/4272))
### Changed ### Changed
* Updated Jackson to 2.21.6 * Improved usability of the trust on first use dialog ([#4295](https://github.com/cryptomator/cryptomator/pull/4295))
* Migrated code to common JDK 25 APIs and constructs
* Added Maven profile to run the app from the command line ([#4317](https://github.com/cryptomator/cryptomator/pull/4317))
* Updated dependencies:
- `org.cryptomator:integrations-linux` from 1.7.0 to 1.8.0-beta1
- `com.fasterxml.jackson.core:jackson-databind` from 2.21.4 to 2.21.6
- `com.fasterxml.jackson.datatype:jackson-datatype-jsr310` from 2.21.4 to 2.21.6
## [1.19.3](https://github.com/cryptomator/cryptomator/releases/1.19.3) - 2026-06-29 ## [1.19.3](https://github.com/cryptomator/cryptomator/releases/1.19.3) - 2026-06-29
@@ -19,7 +28,8 @@ Changes to prior versions can be found on the [Github release page](https://gith
### Fixed ### Fixed
* Fixed Cryptomator file extensions were not registered on Windows ([#4219](https://github.com/cryptomator/cryptomator/issues/4219)) * Fixed Cryptomator file extensions were not registered on Windows ([#4219](https://github.com/cryptomator/cryptomator/issues/4219))
* Fixed warning was displayed when accessing update tab in settings even though an update check did not ran ([#4199](https://github.com/cryptomator/cryptomator/pull/4199)) * Fixed warning was displayed when accessing update tab in settings even though an update check did not ran ([#4194](https://github.com/cryptomator/cryptomator/pull/4194))
* Fixed the same vault could be added several times to the vault list ([#4243](https://github.com/cryptomator/cryptomator/pull/4243))
* Fixed several Decrypt Name dialogs could be opened on the same vault ([#4164](https://github.com/cryptomator/cryptomator/pull/4164)) * Fixed several Decrypt Name dialogs could be opened on the same vault ([#4164](https://github.com/cryptomator/cryptomator/pull/4164))
* Fixed not all mount options in vault specific settings could be displayed ([#4227](https://github.com/cryptomator/cryptomator/pull/4227)) * Fixed not all mount options in vault specific settings could be displayed ([#4227](https://github.com/cryptomator/cryptomator/pull/4227))
* Fixed localhost alias on Windows was not removed on uninstall ([#3993](https://github.com/cryptomator/cryptomator/issues/3993)) * Fixed localhost alias on Windows was not removed on uninstall ([#3993](https://github.com/cryptomator/cryptomator/issues/3993))
@@ -31,6 +41,9 @@ Changes to prior versions can be found on the [Github release page](https://gith
* Drop signing with Actalis issued certificate ([#4169](https://github.com/cryptomator/cryptomator/pull/4169), [#4262](https://github.com/cryptomator/cryptomator/pull/4262)) * Drop signing with Actalis issued certificate ([#4169](https://github.com/cryptomator/cryptomator/pull/4169), [#4262](https://github.com/cryptomator/cryptomator/pull/4262))
* Fix dagger binding graph issues ([#4147](https://github.com/cryptomator/cryptomator/pull/4147)) * Fix dagger binding graph issues ([#4147](https://github.com/cryptomator/cryptomator/pull/4147))
* Added flatpak build to CI ([#4199](https://github.com/cryptomator/cryptomator/pull/4199)) * Added flatpak build to CI ([#4199](https://github.com/cryptomator/cryptomator/pull/4199))
* Added monthly distribution builds to CI ([#4187](https://github.com/cryptomator/cryptomator/pull/4187))
* Replaced Guava cache with Caffeine
* Updated translations ([#4223](https://github.com/cryptomator/cryptomator/pull/4223))
* Updated dependencies: * Updated dependencies:
- `org.cryptomator:webdav-nio-adapter` from 3.0.1 to 3.0.2 - `org.cryptomator:webdav-nio-adapter` from 3.0.1 to 3.0.2
- `org.cryptomator:integrations-api` from 1.8.0 to 1.9.0 - `org.cryptomator:integrations-api` from 1.8.0 to 1.9.0
+1 -2
View File
@@ -143,8 +143,7 @@ cp ../embedded.provisionprofile ${APP_NAME}.app/Contents/
-Dlicense.fileTemplate=resources/licenseTemplate.ftl \ -Dlicense.fileTemplate=resources/licenseTemplate.ftl \
-Dlicense.includedScopes=compile \ -Dlicense.includedScopes=compile \
-Dlicense.excludedGroups=^org\.cryptomator \ -Dlicense.excludedGroups=^org\.cryptomator \
-Dlicense.failOnMissing=true \ -Dlicense.failOnMissing=true
-Dlicense.licenseMergesUrl=file://$(pwd)/../../../license/merges
# codesign # codesign
if [ -n "${CODESIGN_IDENTITY}" ] && [ -n "${TEAM_IDENTIFIER}" ]; then if [ -n "${CODESIGN_IDENTITY}" ] && [ -n "${TEAM_IDENTIFIER}" ]; then
+2 -4
View File
@@ -213,8 +213,7 @@ Invoke-CommandWithExitCheck -Command `
"-Dlicense.outputDirectory=$buildDir\resources\", ` "-Dlicense.outputDirectory=$buildDir\resources\", `
"-Dlicense.includedScopes=compile", ` "-Dlicense.includedScopes=compile", `
"-Dlicense.excludedGroups=^org\.cryptomator", ` "-Dlicense.excludedGroups=^org\.cryptomator", `
"-Dlicense.failOnMissing=true", ` "-Dlicense.failOnMissing=true")
"-Dlicense.licenseMergesUrl=file:///$buildDir/../../license/merges")
# patch app dir # patch app dir
Copy-Item "contrib\*" -Destination "$AppName" Copy-Item "contrib\*" -Destination "$AppName"
@@ -260,8 +259,7 @@ Invoke-CommandWithExitCheck -Command `
"-Dlicense.outputDirectory=$buildDir\bundle\resources\", ` "-Dlicense.outputDirectory=$buildDir\bundle\resources\", `
"-Dlicense.includedScopes=compile", ` "-Dlicense.includedScopes=compile", `
"-Dlicense.excludedGroups=^org\.cryptomator", ` "-Dlicense.excludedGroups=^org\.cryptomator", `
"-Dlicense.failOnMissing=true", ` "-Dlicense.failOnMissing=true")
"-Dlicense.licenseMergesUrl=file:///$buildDir/../../license/merges")
# download Winfsp # download Winfsp
$winfspMsiUrl= 'https://github.com/winfsp/winfsp/releases/download/v2.1/winfsp-2.1.25156.msi' $winfspMsiUrl= 'https://github.com/winfsp/winfsp/releases/download/v2.1/winfsp-2.1.25156.msi'
+2 -2
View File
@@ -1,7 +1,7 @@
Apache License v2.0|Apache License, Version 2.0|The Apache License, Version 2.0|The Apache Software License, Version 2.0|Apache 2.0|Apache Software License - Version 2.0|Apache-2.0 Apache License v2.0|Apache License, Version 2.0|The Apache License, Version 2.0|The Apache Software License, Version 2.0|Apache 2.0|Apache Software License - Version 2.0|Apache-2.0
MIT License|MIT|The MIT License (MIT)|The MIT License|MIT license MIT License|MIT|The MIT License (MIT)|The MIT License|MIT license
LGPL 2.1|LGPL, version 2.1|GNU Lesser/Library General Public License version 2|GNU Lesser General Public License Version 2.1|GNU Lesser General Public License LGPL 2.1|LGPL, version 2.1|GNU Lesser/Library General Public License version 2|GNU Lesser General Public License Version 2.1|GNU Lesser General Public License|LGPL-2.1-only
GPLv2|GNU General Public License Version 2 GPLv2|GNU General Public License Version 2
GPLv2+CE|CDDL + GPLv2 with classpath exception GPLv2+CE|CDDL + GPLv2 with classpath exception
Eclipse Public License - Version 1.0|Eclipse Public License - v 1.0 Eclipse Public License - Version 1.0|Eclipse Public License - v 1.0
Eclipse Public License - Version 2.0|Eclipse Public License - v 2.0 Eclipse Public License - Version 2.0|Eclipse Public License - v 2.0|EPL-2.0
+3 -1
View File
@@ -426,6 +426,9 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId> <artifactId>license-maven-plugin</artifactId>
<configuration>
<licenseMergesUrl>${project.baseUri}license/merges</licenseMergesUrl>
</configuration>
<executions> <executions>
<execution> <execution>
<id>add-third-party</id> <id>add-third-party</id>
@@ -437,7 +440,6 @@
<thirdPartyFilename>THIRD-PARTY.txt</thirdPartyFilename> <thirdPartyFilename>THIRD-PARTY.txt</thirdPartyFilename>
<includedScopes>compile</includedScopes> <includedScopes>compile</includedScopes>
<excludedGroups>org\.cryptomator</excludedGroups> <excludedGroups>org\.cryptomator</excludedGroups>
<licenseMergesUrl>file:///${project.basedir}/license/merges</licenseMergesUrl>
<fileTemplate>${project.basedir}/src/main/resources/license/template.ftl</fileTemplate> <fileTemplate>${project.basedir}/src/main/resources/license/template.ftl</fileTemplate>
</configuration> </configuration>
</execution> </execution>