From a5f8511e8eda6eb3158681a6adb217686c9e7924 Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Tue, 14 Jan 2025 13:38:19 +0100
Subject: [PATCH 1/3] ci: update mx version

---
 common.json                         | 2 +-
 substratevm/mx.substratevm/suite.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common.json b/common.json
index 392bffc02c1e..b9410a995c3a 100644
--- a/common.json
+++ b/common.json
@@ -4,7 +4,7 @@
     "Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
   ],
 
-  "mx_version": "7.36.5",
+  "mx_version": "7.38.0",
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {
diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
index b2df4e28b9e4..f89868c00292 100644
--- a/substratevm/mx.substratevm/suite.py
+++ b/substratevm/mx.substratevm/suite.py
@@ -1,6 +1,6 @@
 # pylint: disable=line-too-long
 suite = {
-    "mxversion": "7.33.1",
+    "mxversion": "7.38.0",
     "name": "substratevm",
     "version" : "25.0.0",
     "release" : False,

From 2b1e654b33ff4a35ac613b22698964644c221a36 Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Tue, 14 Jan 2025 13:41:15 +0100
Subject: [PATCH 2/3] svm: run style gate on JDK latest

---
 substratevm/ci/ci.jsonnet | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/substratevm/ci/ci.jsonnet b/substratevm/ci/ci.jsonnet
index 43965f87d83c..345ae2ef2fbf 100644
--- a/substratevm/ci/ci.jsonnet
+++ b/substratevm/ci/ci.jsonnet
@@ -19,6 +19,7 @@
   local mxgate(tags) = os_arch_jdk_mixin + sg.mxgate(tags, suite="substratevm", suite_short="svm") + task_spec(common.deps.svm),
 
   local eclipse = task_spec(common.deps.eclipse),
+  local spotbugs = task_spec(common.deps.spotbugs),
   local jdt = task_spec(common.deps.jdt),
   local gate = sg.gate,
   local gdb(version) = task_spec(sg.gdb(version)),
@@ -117,10 +118,8 @@
 
   // START MAIN BUILD DEFINITION
   local task_dict = {
-    "style-fullbuild": mxgate("fullbuild,style,nativeimagehelp,check_libcontainer_annotations,check_libcontainer_namespace") + eclipse + jdt + maven + mx_build_exploded + gdb("14.2") + platform_spec(no_jobs) + platform_spec({
-      // We could run the style gate on JDK 22 as well, and use old JDKs for running tools like StopBugs etc.,
-      // but since we support JDK 21 anyways, there is not good reason to do so.
-      "linux:amd64:jdk21": gate + t("30:00"),
+    "style-fullbuild": mxgate("fullbuild,style,nativeimagehelp,check_libcontainer_annotations,check_libcontainer_namespace") + eclipse + jdt + spotbugs + maven + mx_build_exploded + gdb("14.2") + platform_spec(no_jobs) + platform_spec({
+      "linux:amd64:jdk-latest": gate + t("30:00"),
     }),
     "basics": mxgate("build,helloworld,native_unittests,truffle_unittests,debuginfotest,hellomodule,java_agent") + maven + jsonschema + platform_spec(no_jobs) + platform_spec({
       "linux:amd64:jdk-latest": gate + gdb("14.2") + t("55:00"),

From fc9bf62f874fa9241db78245545dd256f6e45b62 Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Thu, 16 Jan 2025 10:46:50 +0100
Subject: [PATCH 3/3] github: move svm gate to JDK latest

---
 .github/workflows/main.yml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9961cee2f360..b93e58e6cce4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0
@@ -76,6 +76,7 @@ concurrency:
 
 env:
   JAVA_HOME: ${{ github.workspace }}/jdk
+  TOOLS_JAVA_HOME_LOCATION: ${{ github.workspace }}/tools-jdk
   LANG: en_US.UTF-8
   MX_GIT_CACHE: refcache
   MX_PATH: ${{ github.workspace }}/mx
@@ -111,7 +112,8 @@ jobs:
               PRIMARY: "espresso"
           # /substratevm
           - env:
-              JDK_VERSION: "21"
+              JDK_VERSION: "latest"
+              TOOLS_JDK_VERSION: "21"
               GATE_TAGS: "style,fullbuild"
               PRIMARY: "substratevm"
           - env:
@@ -189,6 +191,11 @@ jobs:
       run: |
         mkdir jdk-dl
         ${MX_PATH}/mx --java-home= fetch-jdk --jdk-id labsjdk-ce-${JDK_VERSION} --to jdk-dl --alias ${JAVA_HOME}
+    - name: Fetch Tools JDK
+      env: ${{ matrix.env }}
+      if: ${{ matrix.env.TOOLS_JDK_VERSION != '' }}
+      run: |
+        ${MX_PATH}/mx --java-home= fetch-jdk --jdk-id labsjdk-ce-${TOOLS_JDK_VERSION} --to jdk-dl --alias ${TOOLS_JAVA_HOME_LOCATION}
     - name: Update dependency cache
       if: ${{ env.MX_RUNS_DEBUG == 'true' || env.MX_RUNS_STYLE == 'true' }}
       run: sudo apt update
@@ -217,7 +224,7 @@ jobs:
       run: rm -rf .git
     - name: Build GraalVM and run gate with tags
       env: ${{ matrix.env }}
-      run: ${MX_PATH}/mx --primary-suite-path ${PRIMARY} --java-home=${JAVA_HOME} gate --strict-mode ${{ matrix.env.GATE_OPTS }} --tags ${GATE_TAGS}
+      run: ${MX_PATH}/mx --primary-suite-path ${PRIMARY} --java-home=${JAVA_HOME} --tools-java-home=${{ matrix.env.TOOLS_JDK_VERSION != '' && env.TOOLS_JAVA_HOME_LOCATION || '' }} gate --strict-mode ${{ matrix.env.GATE_OPTS }} --tags ${GATE_TAGS}
       if: ${{ matrix.env.GATE_TAGS != '' }}
     - name: Build GraalVM and run gate without tags
       env: ${{ matrix.env }}