[GR-61565] Move compiler style gate to JDK latest

PullRequest: graal/19876
oracle · Jan 24, 2025 · 0a48e5c · 0a48e5c
2 parents bb418a9 + f0ed451
commit 0a48e5c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -98,7 +98,8 @@ jobs:
         include:
           # /compiler
           - env:
-              JDK_VERSION: "21"
+              JDK_VERSION: "latest"
+              TOOLS_JDK_VERSION: "21"
               GATE_TAGS: "style,fullbuild,test"
               PRIMARY: "compiler"
           - env:

diff --git a/compiler/ci/ci_common/gate.jsonnet b/compiler/ci/ci_common/gate.jsonnet
@@ -164,7 +164,7 @@
   bootstrap_full_zgc:: s.base("build,bootstrapfullverify", no_warning_as_error=true, extra_vm_args="-XX:+UseZGC"),
   bootstrap_economy:: s.base("build,bootstrapeconomy", no_warning_as_error=true, extra_vm_args="-Djdk.graal.CompilerConfiguration=economy"),
 
-  style:: c.deps.eclipse + c.deps.jdt + s.base("style,fullbuild,javadoc") + galahad.exclude,
+  style:: c.deps.eclipse + c.deps.jdt + c.deps.spotbugs + s.base("style,fullbuild,javadoc") + galahad.exclude,
 
   avx3:: {
     capabilities+: ["avx512"],
@@ -231,8 +231,8 @@
 
     # Style jobs need to stay on a JDK compatible with all the style
     # checking tools (SpotBugs, Checkstyle, Eclipse formatter etc).
-    "gate-compiler-style-labsjdk-21-linux-amd64": t("45:00"),
-    "gate-compiler-build-labsjdk-latest-linux-amd64": t("25:00"),
+    "gate-compiler-style-labsjdk-latest-linux-amd64": t("45:00"),
+    "gate-compiler-build-labsjdk-21-linux-amd64": t("25:00"),
 
     "gate-compiler-ctw-labsjdk-latest-linux-amd64": {},
     "gate-compiler-ctw-labsjdk-latest-windows-amd64": t("1:50:00"),
@@ -485,13 +485,13 @@
     ]
   ],
 
-  local style_builds = [self.make_build("21", "linux-amd64", "style").build + {
+  local style_builds = [self.make_build(self.jdk_latest, "linux-amd64", "style").build + {
       environment+: {
         # Run the strict JVMCI version check, i.e., that JVMCIVersionCheck.JVMCI_MIN_VERSION matches the versions in common.json.
         JVMCI_VERSION_CHECK: "strict",
       },
   }],
-  local jdk_latest_version_check_builds = [self.make_build(self.jdk_latest, "linux-amd64", "build", extra_tasks={build:: s.base("build"),}).build + galahad.exclude {
+  local jdk_21_version_check_builds = [self.make_build("21", "linux-amd64", "build", extra_tasks={build:: s.base("build"),}).build + galahad.exclude {
       environment+: {
         # Run the strict JVMCI version check, i.e., that JVMCIVersionCheck.JVMCI_MIN_VERSION matches the versions in common.json.
         JVMCI_VERSION_CHECK: "strict",
@@ -512,7 +512,7 @@
     all_zgc_builds +
     all_serialgc_builds +
     style_builds +
-    jdk_latest_version_check_builds +
+    jdk_21_version_check_builds +
     linux_amd64_jdk_latest_builds +
     linux_amd64_jdk_latestDebug_builds,