Skip to content

Commit 569499e

Browse files
Switch gradle to 8.14 and JDK to 24 (#848)
1 parent ca4fa74 commit 569499e

File tree

3 files changed

+20
-10
lines changed

3 files changed

+20
-10
lines changed

.github/workflows/backport.yml

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
name: Backport
32
on:
43
pull_request_target:
@@ -8,15 +7,26 @@ on:
87

98
jobs:
109
backport:
10+
name: Backport
1111
runs-on: ubuntu-latest
12+
# Only react to merged PRs for security reasons.
13+
# See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target.
14+
if: >
15+
github.event.pull_request.merged
16+
&& (
17+
github.event.action == 'closed'
18+
|| (
19+
github.event.action == 'labeled'
20+
&& contains(github.event.label.name, 'backport')
21+
)
22+
)
1223
permissions:
1324
contents: write
1425
pull-requests: write
15-
name: Backport
1626
steps:
1727
- name: GitHub App token
1828
id: github_app_token
19-
uses: tibdex/github-app-token@v1.5.0
29+
uses: tibdex/github-app-token@v2.1.0
2030
with:
2131
app_id: ${{ secrets.APP_ID }}
2232
private_key: ${{ secrets.APP_PRIVATE_KEY }}
@@ -26,6 +36,5 @@ jobs:
2636
uses: VachaShah/[email protected]
2737
with:
2838
github_token: ${{ steps.github_app_token.outputs.token }}
29-
branch_name: backport/backport-${{ github.event.number }}
30-
labels_template: "<%= JSON.stringify([...labels, 'autocut']) %>"
31-
failure_labels: "failed backport"
39+
head_template: backport/backport-<%= number %>-to-<%= base %>
40+
failure_labels: backport-failed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
matrix:
2020
java:
2121
- 21
22-
- 23
22+
- 24
2323
os:
2424
- ubuntu-24.04-arm # arm64-preview
2525
- ubuntu-24.04 # x64
@@ -61,7 +61,7 @@ jobs:
6161
matrix:
6262
java:
6363
- 21
64-
- 23
64+
- 24
6565
name: Build and Test Windows
6666
runs-on: windows-latest
6767

gradle/wrapper/gradle-wrapper.properties

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
3+
distributionSha256Sum=efe9a3d147d948d7528a9887fa35abcf24ca1a43ad06439996490f77569b02d1
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
45
networkTimeout=10000
6+
validateDistributionUrl=true
57
zipStoreBase=GRADLE_USER_HOME
68
zipStorePath=wrapper/dists
7-
distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26

0 commit comments

Comments
 (0)