From 9c3296d04dcad718b09a679a6c3da4b0c823a27e Mon Sep 17 00:00:00 2001 From: ol-automation_ww Date: Fri, 12 May 2023 21:15:42 +0000 Subject: [PATCH] Update graal import. --- ci/common.jsonnet | 4 ++-- common.json | 23 +++++++++++++++-------- mx.truffleruby/suite.py | 4 ++-- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/ci/common.jsonnet b/ci/common.jsonnet index 7e5172102b0e..0929d471ca20 100644 --- a/ci/common.jsonnet +++ b/ci/common.jsonnet @@ -22,7 +22,7 @@ local common_json = import "../common.json"; for name in ["oraclejdk20"] + variants("labsjdk-ce-20") + variants("labsjdk-ee-20") } + { [name]: common_json.jdks[name] + { jdk_version:: 21 } - for name in ["oraclejdk21"] + for name in ["oraclejdk21"] + variants("labsjdk-ce-21") + variants("labsjdk-ee-21") }, assert std.assertEqual(std.objectFields(common_json.jdks), std.objectFields(jdks_data)), @@ -58,7 +58,7 @@ local common_json = import "../common.json"; "windows-jdk19": { packages+: { "devkit:VS2022-17.1.0+1": "==0" }}, "windows-jdk20": { packages+: { "devkit:VS2022-17.1.0+1": "==0" }}, "windows-jdk21": { packages+: { "devkit:VS2022-17.1.0+1": "==1" }}, - "linux-jdk17": { packages+: { "devkit:gcc10.3.0-OL6.4+1": "==0" }}, + "linux-jdk17": { packages+: { "devkit:gcc11.2.0-OL6.4+1": "==0" }}, "linux-jdk19": { packages+: { "devkit:gcc11.2.0-OL6.4+1": "==0" }}, "linux-jdk20": { packages+: { "devkit:gcc11.2.0-OL6.4+1": "==0" }}, }, diff --git a/common.json b/common.json index acb47188cea1..15bf2b22e45c 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": "6.20.3", + "mx_version": "6.20.6", "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet", "jdks": { @@ -14,9 +14,9 @@ "labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.7+4-jvmci-23.0-b10", "platformspecific": true }, "labsjdk-ce-17Debug": {"name": "labsjdk", "version": "ce-17.0.7+4-jvmci-23.0-b10-debug", "platformspecific": true }, "labsjdk-ce-17-llvm": {"name": "labsjdk", "version": "ce-17.0.7+4-jvmci-23.0-b10-sulong", "platformspecific": true }, - "labsjdk-ee-17": {"name": "labsjdk", "version": "ee-17.0.7+8-jvmci-23.0-b10", "platformspecific": true }, - "labsjdk-ee-17Debug": {"name": "labsjdk", "version": "ee-17.0.7+8-jvmci-23.0-b10-debug", "platformspecific": true }, - "labsjdk-ee-17-llvm": {"name": "labsjdk", "version": "ee-17.0.7+8-jvmci-23.0-b10-sulong", "platformspecific": true }, + "labsjdk-ee-17": {"name": "labsjdk", "version": "ee-17.0.8+2-jvmci-23.1-b01", "platformspecific": true }, + "labsjdk-ee-17Debug": {"name": "labsjdk", "version": "ee-17.0.8+2-jvmci-23.1-b01-debug", "platformspecific": true }, + "labsjdk-ee-17-llvm": {"name": "labsjdk", "version": "ee-17.0.8+2-jvmci-23.1-b01-sulong", "platformspecific": true }, "oraclejdk19": {"name": "jpg-jdk", "version": "19", "build_id": "26", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]}, "labsjdk-ce-19": {"name": "labsjdk", "version": "ce-19.0.1+10-jvmci-23.0-b04", "platformspecific": true }, @@ -30,11 +30,18 @@ "labsjdk-ce-20": {"name": "labsjdk", "version": "ce-20+34-jvmci-23.0-b10", "platformspecific": true }, "labsjdk-ce-20Debug": {"name": "labsjdk", "version": "ce-20+34-jvmci-23.0-b10-debug", "platformspecific": true }, "labsjdk-ce-20-llvm": {"name": "labsjdk", "version": "ce-20+34-jvmci-23.0-b10-sulong", "platformspecific": true }, - "labsjdk-ee-20": {"name": "labsjdk", "version": "ee-20.0.1+9-jvmci-23.0-b10", "platformspecific": true }, - "labsjdk-ee-20Debug": {"name": "labsjdk", "version": "ee-20.0.1+9-jvmci-23.0-b10-debug", "platformspecific": true }, - "labsjdk-ee-20-llvm": {"name": "labsjdk", "version": "ee-20.0.1+9-jvmci-23.0-b10-sulong", "platformspecific": true }, + "labsjdk-ee-20": {"name": "labsjdk", "version": "ee-20.0.2+2-jvmci-23.1-b01", "platformspecific": true }, + "labsjdk-ee-20Debug": {"name": "labsjdk", "version": "ee-20.0.2+2-jvmci-23.1-b01-debug", "platformspecific": true }, + "labsjdk-ee-20-llvm": {"name": "labsjdk", "version": "ee-20.0.2+2-jvmci-23.1-b01-sulong", "platformspecific": true }, + + "oraclejdk21": {"name": "jpg-jdk", "version": "21", "build_id": "15", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]}, + "labsjdk-ce-21": {"name": "labsjdk", "version": "ce-21+19-jvmci-23.1-b01", "platformspecific": true }, + "labsjdk-ce-21Debug": {"name": "labsjdk", "version": "ce-21+19-jvmci-23.1-b01-debug", "platformspecific": true }, + "labsjdk-ce-21-llvm": {"name": "labsjdk", "version": "ce-21+19-jvmci-23.1-b01-sulong", "platformspecific": true }, + "labsjdk-ee-21": {"name": "labsjdk", "version": "ee-21+19-jvmci-23.1-b01", "platformspecific": true }, + "labsjdk-ee-21Debug": {"name": "labsjdk", "version": "ee-21+19-jvmci-23.1-b01-debug", "platformspecific": true }, + "labsjdk-ee-21-llvm": {"name": "labsjdk", "version": "ee-21+19-jvmci-23.1-b01-sulong", "platformspecific": true } - "oraclejdk21": {"name": "jpg-jdk", "version": "21", "build_id": "15", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]} }, "eclipse": { diff --git a/mx.truffleruby/suite.py b/mx.truffleruby/suite.py index b966fdf9396a..add26fa536f0 100644 --- a/mx.truffleruby/suite.py +++ b/mx.truffleruby/suite.py @@ -7,7 +7,7 @@ { "name": "regex", "subdir": True, - "version": "691c375e722825f333ce933e7164fbd7fde8fc44", + "version": "d08de8b4f1a84df6d7a46afc28173f97f2e7c1b5", "urls": [ {"url": "https://github.com/oracle/graal.git", "kind": "git"}, {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"}, @@ -16,7 +16,7 @@ { "name": "sulong", "subdir": True, - "version": "691c375e722825f333ce933e7164fbd7fde8fc44", + "version": "d08de8b4f1a84df6d7a46afc28173f97f2e7c1b5", "urls": [ {"url": "https://github.com/oracle/graal.git", "kind": "git"}, {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},