Skip to content

Commit 1eb996f

Browse files
committed
[GR-44804] Pick mx change which aborts if sforceimports fails to update a suite
1 parent a07e284 commit 1eb996f

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

ci/common.jsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ local common_json = import "../common.json";
4949

5050
# The devkits versions reflect those used to build the JVMCI JDKs (e.g., see devkit_platform_revisions in <jdk>/make/conf/jib-profiles.js)
5151
devkits: {
52-
"windows-jdk17": { packages+: { "devkit:VS2019-16.9.3+1": "==0" }},
52+
"windows-jdk17": { packages+: { "devkit:VS2022-17.1.0+1": "==0" }},
5353
"windows-jdk19": { packages+: { "devkit:VS2022-17.1.0+1": "==0" }},
5454
"windows-jdk20": { packages+: { "devkit:VS2022-17.1.0+1": "==0" }},
5555
"linux-jdk17": { packages+: { "devkit:gcc10.3.0-OL6.4+1": "==0" }},

common.json

Lines changed: 1 addition & 1 deletion
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": "6.16.0",
7+
"mx_version": "6.16.6",
88

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

mx.truffleruby/suite.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
suite = {
2-
"mxversion": "6.11.3",
2+
"mxversion": "6.16.6",
33
"name": "truffleruby",
44

55
"imports": {
66
"suites": [
77
{
88
"name": "regex",
99
"subdir": True,
10-
"version": "ccbe0c944d918159f36bac32e37c1a8cc529604f",
10+
"version": "39c80292e2f92822a3882c1350226706abd78917",
1111
"urls": [
1212
{"url": "https://github.com/oracle/graal.git", "kind": "git"},
1313
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -16,7 +16,7 @@
1616
{
1717
"name": "sulong",
1818
"subdir": True,
19-
"version": "ccbe0c944d918159f36bac32e37c1a8cc529604f",
19+
"version": "39c80292e2f92822a3882c1350226706abd78917",
2020
"urls": [
2121
{"url": "https://github.com/oracle/graal.git", "kind": "git"},
2222
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

0 commit comments

Comments
 (0)