mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-19 11:11:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into libappindicator

Browse Source
This commit is contained in:
Sebastian Stenzel
2023-05-10 20:21:54 +02:00
committed by GitHub
parent 06690e98c7 067a7ad3ee
commit 6bb69ea8d3
23 changed files with 125 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/appimage.yml vendored
View File

@@ -10,7 +10,7 @@ on:
required: false
env:
JAVA_VERSION: 19
JAVA_VERSION: 20
jobs:
get-version:

6
.github/workflows/build.yml vendored
View File

@@ -6,7 +6,7 @@ on:
types: [labeled]
env:
JAVA_VERSION: 19
JAVA_VERSION: 20
defaults:
run:
@@ -53,4 +53,8 @@ jobs:
body: |-
:construction: Work in Progress
Please be patient, the builds are still running. We will publish new versions of Cryptomator here in a few moments.
As usual, the GPG signatures can be checked using [our public key `5811 7AFA 1F85 B3EE C154 677D 615D 449F E6E6 A235`](https://gist.github.com/cryptobot/211111cf092037490275f39d408f461a).
---
<!-- Don't forget to include the 💾 SHA-256 checksums of release artifacts: -->

8
.github/workflows/debian.yml vendored
View File

@@ -19,9 +19,9 @@ on:
type: boolean
env:
JAVA_VERSION: 19
OPENJFX_JMODS_AMD64: 'https://download2.gluonhq.com/openjfx/19.0.2.1/openjfx-19.0.2.1_linux-x64_bin-jmods.zip'
OPENJFX_JMODS_AARCH64: 'https://download2.gluonhq.com/openjfx/19.0.2.1/openjfx-19.0.2.1_linux-aarch64_bin-jmods.zip'
JAVA_VERSION: 20
OPENJFX_JMODS_AMD64: 'https://download2.gluonhq.com/openjfx/20.0.1/openjfx-20.0.1_linux-x64_bin-jmods.zip'
OPENJFX_JMODS_AARCH64: 'https://download2.gluonhq.com/openjfx/20.0.1/openjfx-20.0.1_linux-aarch64_bin-jmods.zip'
jobs:
build:
@@ -45,7 +45,7 @@ jobs:
run: |
sudo add-apt-repository ppa:coffeelibs/openjdk
sudo apt-get update
sudo apt-get install debhelper devscripts dput coffeelibs-jdk-19 libgtk2.0-0
sudo apt-get install debhelper devscripts dput coffeelibs-jdk-${{ env.JAVA_VERSION }} libgtk2.0-0
- name: Setup Java
uses: actions/setup-java@v3
with:

2
.github/workflows/get-version.yml vendored
View File

@@ -22,7 +22,7 @@ on:
value: ${{ jobs.determine-version.outputs.type }}
env:
JAVA_VERSION: 19
JAVA_VERSION: 20
JAVA_DIST: 'temurin'
JAVA_CACHE: 'maven'

2
.github/workflows/mac-dmg.yml vendored
View File

@@ -10,7 +10,7 @@ on:
required: false
env:
JAVA_VERSION: 19
JAVA_VERSION: 20
jobs:
get-version:

2
.github/workflows/pullrequest.yml vendored
View File

@@ -4,7 +4,7 @@ on:
pull_request:
env:
JAVA_VERSION: 19
JAVA_VERSION: 20
defaults:
run:

2
.github/workflows/release-check.yml vendored
View File

@@ -7,7 +7,7 @@ on:
- 'hotfix/**'
env:
JAVA_VERSION: 19
JAVA_VERSION: 20
defaults:
run:

8
.github/workflows/win-exe.yml vendored
View File

@@ -14,11 +14,11 @@ on:
env:
JAVA_VERSION: 19
JAVA_VERSION: 20
JAVA_DIST: 'temurin'
JAVA_CACHE: 'maven'
JFX_JMODS_URL: 'https://download2.gluonhq.com/openjfx/19.0.2.1/openjfx-19.0.2.1_windows-x64_bin-jmods.zip'
JFX_JMODS_HASH: 'B7CF2CAD2468842B3B78D99F6C0555771499A36FA1F1EE3DD1B9A4597F1FAB86'
JFX_JMODS_URL: 'https://download2.gluonhq.com/openjfx/20.0.1/openjfx-20.0.1_windows-x64_bin-jmods.zip'
JFX_JMODS_HASH: 'D00767334C43B8832B5CF10267D34CA8F563D187C4655B73EB6020DD79C054B5'
defaults:
run:
@@ -51,7 +51,7 @@ jobs:
run: |
curl --output jfxjmods.zip -L "${{ env.JFX_JMODS_URL }}"
if(!(Get-FileHash -Path jfxjmods.zip -Algorithm SHA256).Hash.equals("${{ env.JFX_JMODS_HASH }}")) {
exit 1;
throw "Wrong checksum of JMOD archive downloaded from ${{ env.JFX_JMODS_URL }}.";
}
Expand-Archive -Path jfxjmods.zip -DestinationPath jfxjmods
Get-ChildItem -Path jfxjmods -Recurse -Filter "*.jmod" | ForEach-Object { Move-Item -Path $_ -Destination $_.Directory.Parent}