Skip to content

Commit 0a48e5c

Browse files
committed
[GR-61565] Move compiler style gate to JDK latest
PullRequest: graal/19876
2 parents bb418a9 + f0ed451 commit 0a48e5c

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,8 @@ jobs:
9898
include:
9999
# /compiler
100100
- env:
101-
JDK_VERSION: "21"
101+
JDK_VERSION: "latest"
102+
TOOLS_JDK_VERSION: "21"
102103
GATE_TAGS: "style,fullbuild,test"
103104
PRIMARY: "compiler"
104105
- env:

compiler/ci/ci_common/gate.jsonnet

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
bootstrap_full_zgc:: s.base("build,bootstrapfullverify", no_warning_as_error=true, extra_vm_args="-XX:+UseZGC"),
165165
bootstrap_economy:: s.base("build,bootstrapeconomy", no_warning_as_error=true, extra_vm_args="-Djdk.graal.CompilerConfiguration=economy"),
166166

167-
style:: c.deps.eclipse + c.deps.jdt + s.base("style,fullbuild,javadoc") + galahad.exclude,
167+
style:: c.deps.eclipse + c.deps.jdt + c.deps.spotbugs + s.base("style,fullbuild,javadoc") + galahad.exclude,
168168

169169
avx3:: {
170170
capabilities+: ["avx512"],
@@ -231,8 +231,8 @@
231231

232232
# Style jobs need to stay on a JDK compatible with all the style
233233
# checking tools (SpotBugs, Checkstyle, Eclipse formatter etc).
234-
"gate-compiler-style-labsjdk-21-linux-amd64": t("45:00"),
235-
"gate-compiler-build-labsjdk-latest-linux-amd64": t("25:00"),
234+
"gate-compiler-style-labsjdk-latest-linux-amd64": t("45:00"),
235+
"gate-compiler-build-labsjdk-21-linux-amd64": t("25:00"),
236236

237237
"gate-compiler-ctw-labsjdk-latest-linux-amd64": {},
238238
"gate-compiler-ctw-labsjdk-latest-windows-amd64": t("1:50:00"),
@@ -485,13 +485,13 @@
485485
]
486486
],
487487

488-
local style_builds = [self.make_build("21", "linux-amd64", "style").build + {
488+
local style_builds = [self.make_build(self.jdk_latest, "linux-amd64", "style").build + {
489489
environment+: {
490490
# Run the strict JVMCI version check, i.e., that JVMCIVersionCheck.JVMCI_MIN_VERSION matches the versions in common.json.
491491
JVMCI_VERSION_CHECK: "strict",
492492
},
493493
}],
494-
local jdk_latest_version_check_builds = [self.make_build(self.jdk_latest, "linux-amd64", "build", extra_tasks={build:: s.base("build"),}).build + galahad.exclude {
494+
local jdk_21_version_check_builds = [self.make_build("21", "linux-amd64", "build", extra_tasks={build:: s.base("build"),}).build + galahad.exclude {
495495
environment+: {
496496
# Run the strict JVMCI version check, i.e., that JVMCIVersionCheck.JVMCI_MIN_VERSION matches the versions in common.json.
497497
JVMCI_VERSION_CHECK: "strict",
@@ -512,7 +512,7 @@
512512
all_zgc_builds +
513513
all_serialgc_builds +
514514
style_builds +
515-
jdk_latest_version_check_builds +
515+
jdk_21_version_check_builds +
516516
linux_amd64_jdk_latest_builds +
517517
linux_amd64_jdk_latestDebug_builds,
518518

0 commit comments

Comments
 (0)