Skip to content

Commit

Permalink
[GR-26395] Periodic update of the graal import.
Browse files Browse the repository at this point in the history
PullRequest: truffleruby/3905
  • Loading branch information
OracleLabsAutomation authored and eregon committed Jul 21, 2023
2 parents 16db2e6 + b613f0a commit 9ba6955
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 11 deletions.
6 changes: 5 additions & 1 deletion ci/common.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,10 @@ local common_json = import "../common.json";
post_merge: {
targets+: ["post-merge"],
},
opt_post_merge: {
targets+: ["opt-post-merge"],
tags+: []
},
daily: {
targets+: ["daily"],
},
Expand All @@ -173,7 +177,7 @@ local common_json = import "../common.json";
},
monthly: {
targets+: ["monthly"],
},
}
},

# Hardware definitions and common fields
Expand Down
16 changes: 8 additions & 8 deletions 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": "6.27.6",
"mx_version": "6.29.0",

"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
"jdks": {
Expand Down Expand Up @@ -34,13 +34,13 @@
"labsjdk-ee-20Debug": {"name": "labsjdk", "version": "ee-20.0.2+2-jvmci-23.1-b02-debug", "platformspecific": true },
"labsjdk-ee-20-llvm": {"name": "labsjdk", "version": "ee-20.0.2+2-jvmci-23.1-b02-sulong", "platformspecific": true },

"oraclejdk21": {"name": "jpg-jdk", "version": "21", "build_id": "28", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
"labsjdk-ce-21": {"name": "labsjdk", "version": "ce-21+28-jvmci-23.1-b09", "platformspecific": true },
"labsjdk-ce-21Debug": {"name": "labsjdk", "version": "ce-21+28-jvmci-23.1-b09-debug", "platformspecific": true },
"labsjdk-ce-21-llvm": {"name": "labsjdk", "version": "ce-21+28-jvmci-23.1-b09-sulong", "platformspecific": true },
"labsjdk-ee-21": {"name": "labsjdk", "version": "ee-21+28-jvmci-23.1-b09", "platformspecific": true },
"labsjdk-ee-21Debug": {"name": "labsjdk", "version": "ee-21+28-jvmci-23.1-b09-debug", "platformspecific": true },
"labsjdk-ee-21-llvm": {"name": "labsjdk", "version": "ee-21+28-jvmci-23.1-b09-sulong", "platformspecific": true },
"oraclejdk21": {"name": "jpg-jdk", "version": "21", "build_id": "30", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
"labsjdk-ce-21": {"name": "labsjdk", "version": "ce-21+30-jvmci-23.1-b10", "platformspecific": true },
"labsjdk-ce-21Debug": {"name": "labsjdk", "version": "ce-21+30-jvmci-23.1-b10-debug", "platformspecific": true },
"labsjdk-ce-21-llvm": {"name": "labsjdk", "version": "ce-21+30-jvmci-23.1-b10-sulong", "platformspecific": true },
"labsjdk-ee-21": {"name": "labsjdk", "version": "ee-21+30-jvmci-23.1-b10", "platformspecific": true },
"labsjdk-ee-21Debug": {"name": "labsjdk", "version": "ee-21+30-jvmci-23.1-b10-debug", "platformspecific": true },
"labsjdk-ee-21-llvm": {"name": "labsjdk", "version": "ee-21+30-jvmci-23.1-b10-sulong", "platformspecific": true },

"oraclejdk22": {"name": "jpg-jdk", "version": "22", "build_id": "1", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]}
},
Expand Down
4 changes: 2 additions & 2 deletions mx.truffleruby/suite.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{
"name": "regex",
"subdir": True,
"version": "53bd3f0cb3f3a4e07d725203f3c352e34c6a845d",
"version": "c218b7eede776486dcb3bbdfcdaa60202ac6a585",
"urls": [
{"url": "https://github.com/oracle/graal.git", "kind": "git"},
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
Expand All @@ -16,7 +16,7 @@
{
"name": "sulong",
"subdir": True,
"version": "53bd3f0cb3f3a4e07d725203f3c352e34c6a845d",
"version": "c218b7eede776486dcb3bbdfcdaa60202ac6a585",
"urls": [
{"url": "https://github.com/oracle/graal.git", "kind": "git"},
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
Expand Down

0 comments on commit 9ba6955

Please sign in to comment.