Skip to content

Commit 258a5d4

Browse files
committed
[GR-61342] Move SVM style gate to JDK latest
PullRequest: graal/19789
2 parents dafeca6 + fc9bf62 commit 258a5d4

File tree

4 files changed

+15
-9
lines changed

4 files changed

+15
-9
lines changed

.github/workflows/main.yml

+10-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# The Universal Permissive License (UPL), Version 1.0
@@ -76,6 +76,7 @@ concurrency:
7676

7777
env:
7878
JAVA_HOME: ${{ github.workspace }}/jdk
79+
TOOLS_JAVA_HOME_LOCATION: ${{ github.workspace }}/tools-jdk
7980
LANG: en_US.UTF-8
8081
MX_GIT_CACHE: refcache
8182
MX_PATH: ${{ github.workspace }}/mx
@@ -111,7 +112,8 @@ jobs:
111112
PRIMARY: "espresso"
112113
# /substratevm
113114
- env:
114-
JDK_VERSION: "21"
115+
JDK_VERSION: "latest"
116+
TOOLS_JDK_VERSION: "21"
115117
GATE_TAGS: "style,fullbuild"
116118
PRIMARY: "substratevm"
117119
- env:
@@ -183,6 +185,11 @@ jobs:
183185
run: |
184186
mkdir jdk-dl
185187
${MX_PATH}/mx --java-home= fetch-jdk --jdk-id labsjdk-ce-${JDK_VERSION} --to jdk-dl --alias ${JAVA_HOME}
188+
- name: Fetch Tools JDK
189+
env: ${{ matrix.env }}
190+
if: ${{ matrix.env.TOOLS_JDK_VERSION != '' }}
191+
run: |
192+
${MX_PATH}/mx --java-home= fetch-jdk --jdk-id labsjdk-ce-${TOOLS_JDK_VERSION} --to jdk-dl --alias ${TOOLS_JAVA_HOME_LOCATION}
186193
- name: Update dependency cache
187194
if: ${{ env.MX_RUNS_DEBUG == 'true' || env.MX_RUNS_STYLE == 'true' }}
188195
run: sudo apt update
@@ -211,7 +218,7 @@ jobs:
211218
run: rm -rf .git
212219
- name: Build GraalVM and run gate with tags
213220
env: ${{ matrix.env }}
214-
run: ${MX_PATH}/mx --primary-suite-path ${PRIMARY} --java-home=${JAVA_HOME} gate --strict-mode ${{ matrix.env.GATE_OPTS }} --tags ${GATE_TAGS}
221+
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}
215222
if: ${{ matrix.env.GATE_TAGS != '' }}
216223
- name: Build GraalVM and run gate without tags
217224
env: ${{ matrix.env }}

common.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
55
],
66

7-
"mx_version": "7.36.5",
7+
"mx_version": "7.38.0",
88

99
"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
1010
"jdks": {

substratevm/ci/ci.jsonnet

+3-4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
local mxgate(tags) = os_arch_jdk_mixin + sg.mxgate(tags, suite="substratevm", suite_short="svm") + task_spec(common.deps.svm),
2020

2121
local eclipse = task_spec(common.deps.eclipse),
22+
local spotbugs = task_spec(common.deps.spotbugs),
2223
local jdt = task_spec(common.deps.jdt),
2324
local gate = sg.gate,
2425
local gdb(version) = task_spec(sg.gdb(version)),
@@ -117,10 +118,8 @@
117118

118119
// START MAIN BUILD DEFINITION
119120
local task_dict = {
120-
"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({
121-
// We could run the style gate on JDK 22 as well, and use old JDKs for running tools like StopBugs etc.,
122-
// but since we support JDK 21 anyways, there is not good reason to do so.
123-
"linux:amd64:jdk21": gate + t("30:00"),
121+
"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({
122+
"linux:amd64:jdk-latest": gate + t("30:00"),
124123
}),
125124
"basics": mxgate("build,helloworld,native_unittests,truffle_unittests,debuginfotest,hellomodule,java_agent,condconfig") + maven + jsonschema + platform_spec(no_jobs) + platform_spec({
126125
"linux:amd64:jdk-latest": gate + gdb("14.2") + t("55:00"),

substratevm/mx.substratevm/suite.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# pylint: disable=line-too-long
22
suite = {
3-
"mxversion": "7.33.1",
3+
"mxversion": "7.38.0",
44
"name": "substratevm",
55
"version" : "25.0.0",
66
"release" : False,

0 commit comments

Comments
 (0)