Skip to content

Commit 8f94097

Browse files
committed
Merge branch 'release/1.3.0'
2 parents 6c08f95 + b3cb765 commit 8f94097

33 files changed

+2588
-314
lines changed

.coderabbit/config.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
path_filters:
2+
exclude:
3+
- src/main/java/org/cryptomator/windows/capi/**

.github/workflows/build.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
name: Build
22
on:
3-
[push]
3+
push:
4+
pull_request_target:
5+
types: [labeled]
46

57
defaults:
68
run:
@@ -16,7 +18,7 @@ jobs:
1618
- uses: actions/setup-java@v4
1719
with:
1820
distribution: 'temurin'
19-
java-version: 17
21+
java-version: 22
2022
cache: 'maven'
2123
- name: Ensure to use tagged version
2224
if: startsWith(github.ref, 'refs/tags/')
@@ -27,7 +29,7 @@ jobs:
2729
run: mvn -B clean test
2830
- name: Codesign DLL on release
2931
if: startsWith(github.ref, 'refs/tags/')
30-
uses: skymatic/code-sign-action@v2
32+
uses: skymatic/code-sign-action@v3
3133
with:
3234
certificate: ${{ secrets.WIN_CODESIGN_P12_BASE64 }}
3335
password: ${{ secrets.WIN_CODESIGN_P12_PW }}
@@ -42,9 +44,9 @@ jobs:
4244
name: artifacts
4345
path: target/*.jar
4446
- name: Create Release
45-
uses: softprops/action-gh-release@v1
47+
uses: softprops/action-gh-release@v2
4648
if: startsWith(github.ref, 'refs/tags/')
4749
with:
4850
prerelease: true
4951
token: ${{ secrets.CRYPTOBOT_RELEASE_TOKEN }}
50-
generate_release_notes: true
52+
generate_release_notes: true

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- uses: actions/setup-java@v4
2626
with:
2727
distribution: 'temurin'
28-
java-version: 17
28+
java-version: 22
2929
cache: 'maven'
3030
- name: Initialize CodeQL
3131
uses: github/codeql-action/init@v3

.github/workflows/dependency-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
with:
1515
runner-os: 'windows-latest'
1616
java-distribution: 'temurin'
17-
java-version: 17
17+
java-version: 22
1818
secrets:
1919
nvd-api-key: ${{ secrets.NVD_API_KEY }}
2020
slack-webhook-url: ${{ secrets.SLACK_WEBHOOK_URL }}

.github/workflows/publish-central.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,11 @@ jobs:
2121
- uses: actions/setup-java@v4
2222
with:
2323
distribution: 'temurin'
24-
java-version: 17
24+
java-version: 22
2525
cache: 'maven'
2626
server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
2727
server-username: MAVEN_USERNAME # env variable for username in deploy
2828
server-password: MAVEN_PASSWORD # env variable for token in deploy
29-
gpg-private-key: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
30-
gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
3129
- name: Enforce project version ${{ github.event.inputs.tag }}
3230
run: mvn versions:set -B -DnewVersion="${{ github.event.inputs.tag }}"
3331
- name: Deploy
@@ -40,4 +38,5 @@ jobs:
4038
--add-opens=java.desktop/java.awt.font=ALL-UNNAMED
4139
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
4240
MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
43-
MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
41+
MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
42+
MAVEN_GPG_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }}

.github/workflows/publish-github.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,16 @@ jobs:
1616
- uses: actions/setup-java@v4
1717
with:
1818
distribution: 'temurin'
19-
java-version: 17
19+
java-version: 22
2020
cache: 'maven'
21-
gpg-private-key: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
22-
gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
2321
- name: Enforce project version ${{ github.event.release.tag_name }}
2422
run: mvn versions:set -B -DnewVersion="${{ github.event.release.tag_name }}"
2523
- name: Deploy
2624
run: mvn deploy -B -DskipTests -Psign,deploy-github --no-transfer-progress
2725
env:
2826
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2927
MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
28+
MAVEN_GPG_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }}
3029
notify:
3130
runs-on: ubuntu-latest
3231
needs: [publish]

.idea/misc.xml

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ This project uses the following JVM properties:
1212

1313
This project uses JNI, hence you'll nedd Java as well as GCC build tools:
1414

15-
* JDK 17
15+
* JDK 22
1616
* Maven
1717
* MinGW GCC compiler (`choco install mingw --version=10.2.0`)
1818
* Make (`choco install make`)

0 commit comments

Comments
 (0)