Skip to content

[GR-61342] Move SVM style gate to JDK latest #10483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion common.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
7 changes: 3 additions & 4 deletions substratevm/ci/ci.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
Expand Down Expand Up @@ -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"),
Expand Down
2 changes: 1 addition & 1 deletion substratevm/mx.substratevm/suite.py
Original file line number Diff line number Diff line change
@@ -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,
Expand Down