Skip to content

Commit f042289

Browse files
author
Pavel Marek
committed
[GR-19768] Update Truffle import.
PullRequest: fastr/2649
2 parents 4c0e222 + 9020fb1 commit f042289

File tree

2 files changed

+32
-7
lines changed

2 files changed

+32
-7
lines changed

graal_common.json

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
"README": "This file contains definitions that are useful for the hocon and jsonnet CI files of multiple repositories.",
33

44
"jdks": {
5-
"openjdk8": {"name": "openjdk", "version": "8u302+06-jvmci-21.2-b05", "platformspecific": true },
6-
"oraclejdk8": {"name": "oraclejdk", "version": "8u301+09-jvmci-21.2-b05", "platformspecific": true },
7-
"oraclejdk8Debug": {"name": "oraclejdk", "version": "8u301+09-jvmci-21.2-b05-fastdebug", "platformspecific": true },
5+
"openjdk8": {"name": "openjdk", "version": "8u302+06-jvmci-21.3-b01", "platformspecific": true },
6+
"oraclejdk8": {"name": "oraclejdk", "version": "8u301+09-jvmci-21.3-b01", "platformspecific": true },
7+
"oraclejdk8Debug": {"name": "oraclejdk", "version": "8u301+09-jvmci-21.3-b01-fastdebug", "platformspecific": true },
88

99
"openjdk11": {"name": "openjdk", "version": "11.0.11+9", "platformspecific": true },
1010
"oraclejdk11": {"name": "oraclejdk", "version": "11.0.11+9", "platformspecific": true },
11-
"labsjdk-ce-11": {"name": "labsjdk", "version": "ce-11.0.12+5-jvmci-21.2-b05", "platformspecific": true },
12-
"labsjdk-ee-11": {"name": "labsjdk", "version": "ee-11.0.12+8-jvmci-21.2-b05", "platformspecific": true },
11+
"labsjdk-ce-11": {"name": "labsjdk", "version": "ce-11.0.12+5-jvmci-21.3-b01", "platformspecific": true },
12+
"labsjdk-ee-11": {"name": "labsjdk", "version": "ee-11.0.13+2-jvmci-21.3-b01", "platformspecific": true },
1313

1414
"oraclejdk16": {"name": "oraclejdk", "version": "16.0.1+4", "platformspecific": true },
1515
"labsjdk-ce-16": {"name": "labsjdk", "version": "ce-16.0.2+7-jvmci-21.2-b05", "platformspecific": true },
@@ -83,6 +83,7 @@
8383
},
8484
"sulong": {
8585
"deps": {
86+
"common": {},
8687
"linux": {
8788
"packages": {
8889
"cmake": "==3.15.2"
@@ -100,5 +101,29 @@
100101
}
101102
}
102103
}
104+
},
105+
"truffleruby": {
106+
"deps": {
107+
"common": {},
108+
"linux": {
109+
"packages": {
110+
"ruby": "==2.6.3"
111+
}
112+
},
113+
"darwin": {}
114+
}
115+
},
116+
"graalnodejs": {
117+
"deps": {
118+
"common": {},
119+
"linux": {
120+
"packages": {
121+
"binutils": "==2.23.2",
122+
"gcc": "==8.3.0",
123+
"cmake": "==3.15.2"
124+
}
125+
},
126+
"darwin": {}
127+
}
103128
}
104129
}

mx.fastr/suite.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"subdir" : True,
1010
# The version must be the same as the version of Sulong
1111
# TRUFFLE REVISION (note: this is a marker for script that can update this)
12-
"version" : "a94f7d02b95fe8779a6ca4a2f788f90bb636a3c0",
12+
"version" : "4b0a273937065a010f7580043140a327df85f345",
1313
"urls" : [
1414
{"url" : "https://github.com/graalvm/graal", "kind" : "git"},
1515
{"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},
@@ -20,7 +20,7 @@
2020
"subdir" : True,
2121
# The version must be the same as the version of Truffle
2222
# TRUFFLE REVISION (note: this is a marker for script that can update this)
23-
"version" : "a94f7d02b95fe8779a6ca4a2f788f90bb636a3c0",
23+
"version" : "4b0a273937065a010f7580043140a327df85f345",
2424
"urls" : [
2525
{"url" : "https://github.com/graalvm/graal", "kind" : "git"},
2626
{"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},

0 commit comments

Comments
 (0)