Skip to content

Commit 8041650

Browse files
committed
[CI] Revert to JDK 25 builds of graal/master
Adapt to oracle#12210
1 parent 901bee8 commit 8041650

File tree

2 files changed

+27
-27
lines changed

2 files changed

+27
-27
lines changed

.github/workflows/nightly.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,42 +33,42 @@ jobs:
3333
####
3434
# Test Quarkus main with latest graal sources built as Mandrel and GraalVM
3535
####
36-
q-main-graal-26-latest:
37-
name: "Q main G 26 latest"
36+
q-main-graal-25-latest:
37+
name: "Q main G 25 latest"
3838
uses: ./.github/workflows/base.yml
3939
with:
4040
quarkus-version: "main"
4141
mandrel-version: "graal/master"
4242
build-type: "graal-source"
4343
jdk: "latest/ea"
44-
build-stats-tag: "gha-linux-graal-qmain-glatest-jdk26ea"
44+
build-stats-tag: "gha-linux-graal-qmain-glatest-jdk25ea"
4545
secrets:
4646
UPLOAD_COLLECTOR_TOKEN: ${{ secrets.UPLOAD_COLLECTOR_TOKEN }}
47-
q-main-mandrel-26-latest:
48-
name: "Q main M 26 latest"
47+
q-main-mandrel-25-latest:
48+
name: "Q main M 25 latest"
4949
uses: ./.github/workflows/base.yml
5050
with:
5151
quarkus-version: "main"
5252
mandrel-version: "graal/master"
53-
jdk: "26/ea"
54-
issue-number: "855"
53+
jdk: "25/ea"
54+
issue-number: "885"
5555
issue-repo: "graalvm/mandrel"
56-
mandrel-it-issue-number: "346"
57-
build-stats-tag: "gha-linux-mandrel-qmain-mlatest-jdk26ea"
56+
mandrel-it-issue-number: "366"
57+
build-stats-tag: "gha-linux-mandrel-qmain-mlatest-jdk25ea"
5858
secrets:
5959
ISSUE_BOT_TOKEN: ${{ secrets.MANDREL_BOT_TOKEN }}
6060
UPLOAD_COLLECTOR_TOKEN: ${{ secrets.UPLOAD_COLLECTOR_TOKEN }}
61-
q-main-mandrel-26-latest-win:
62-
name: "Q main M 26 latest windows"
61+
q-main-mandrel-25-latest-win:
62+
name: "Q main M 25 latest windows"
6363
uses: ./.github/workflows/base-windows.yml
6464
with:
6565
quarkus-version: "main"
6666
mandrel-version: "graal/master"
67-
issue-number: "856"
67+
issue-number: "884"
6868
issue-repo: "graalvm/mandrel"
69-
mandrel-it-issue-number: "347"
70-
jdk: "26/ea"
71-
build-stats-tag: "gha-win-mandrel-qmain-mlatest-jdk26ea"
69+
mandrel-it-issue-number: "367"
70+
jdk: "25/ea"
71+
build-stats-tag: "gha-win-mandrel-qmain-mlatest-jdk25ea"
7272
secrets:
7373
ISSUE_BOT_TOKEN: ${{ secrets.MANDREL_BOT_TOKEN }}
7474
UPLOAD_COLLECTOR_TOKEN: ${{ secrets.UPLOAD_COLLECTOR_TOKEN }}

.github/workflows/weekly.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ jobs:
3333
####
3434
# Test Q main and Mandrel 25.0 JDK 25
3535
####
36-
q-main-mandrel-25-latest:
37-
name: "Q main M 25 latest"
36+
q-main-mandrel-25_0:
37+
name: "Q main M 25.0"
3838
uses: ./.github/workflows/base.yml
3939
with:
4040
quarkus-version: "main"
@@ -48,8 +48,8 @@ jobs:
4848
secrets:
4949
ISSUE_BOT_TOKEN: ${{ secrets.MANDREL_BOT_TOKEN }}
5050
UPLOAD_COLLECTOR_TOKEN: ${{ secrets.UPLOAD_COLLECTOR_TOKEN }}
51-
q-main-mandrel-25-latest-win:
52-
name: "Q main M 25 latest windows"
51+
q-main-mandrel-25_0-win:
52+
name: "Q main M 25.0 windows"
5353
uses: ./.github/workflows/base-windows.yml
5454
with:
5555
quarkus-version: "main"
@@ -66,8 +66,8 @@ jobs:
6666
####
6767
# Test Quarkus main with Mandrel for JDK 25 on AArch64
6868
####
69-
q-main-mandrel-25-latest-arm:
70-
name: "Q main M 25 latest on AArch64"
69+
q-main-mandrel-25_0-arm:
70+
name: "Q main M 25.0 on AArch64"
7171
uses: ./.github/workflows/base.yml
7272
with:
7373
quarkus-version: "main"
@@ -85,17 +85,17 @@ jobs:
8585
####
8686
# Test Quarkus main with Mandrel latest on AArch64
8787
####
88-
q-main-mandrel-26-latest-arm:
89-
name: "Q main M 26 latest on AArch64"
88+
q-main-mandrel-25-latest-arm:
89+
name: "Q main M 25 latest on AArch64"
9090
uses: ./.github/workflows/base.yml
9191
with:
9292
quarkus-version: "main"
9393
mandrel-version: "graal/master"
94-
jdk: "26/ea"
95-
issue-number: "872"
94+
jdk: "25/ea"
95+
issue-number: "886"
9696
issue-repo: "graalvm/mandrel"
97-
mandrel-it-issue-number: "359"
98-
build-stats-tag: "gha-linux-aarch64-mandrel-qmain-mlatest-jdk26ea"
97+
mandrel-it-issue-number: "368"
98+
build-stats-tag: "gha-linux-aarch64-mandrel-qmain-mlatest-jdk25ea"
9999
gh-runner: "ubuntu-24.04-arm"
100100
secrets:
101101
ISSUE_BOT_TOKEN: ${{ secrets.MANDREL_BOT_TOKEN }}

0 commit comments

Comments
 (0)