Skip to content

Commit 2e3bf7d

Browse files
[GR-26395] Periodic update of the graal import.
PullRequest: truffleruby/2386
2 parents a7fafd7 + 4bf76fe commit 2e3bf7d

File tree

2 files changed

+73
-13
lines changed

2 files changed

+73
-13
lines changed

common.json

Lines changed: 71 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,85 @@
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": "8u282+07-jvmci-21.0-b06", "platformspecific": true },
6-
"oraclejdk8": {"name": "oraclejdk", "version": "8u281+09-jvmci-21.0-b06", "platformspecific": true },
7-
"oraclejdk8Debug": {"name": "oraclejdk", "version": "8u281+09-jvmci-21.0-b06-fastdebug", "platformspecific": true },
5+
"openjdk8": {"name": "openjdk", "version": "8u282+08-jvmci-21.1-b01", "platformspecific": true },
6+
"oraclejdk8": {"name": "oraclejdk", "version": "8u281+09-jvmci-21.1-b01", "platformspecific": true },
7+
"oraclejdk8Debug": {"name": "oraclejdk", "version": "8u281+09-jvmci-21.1-b01-fastdebug", "platformspecific": true },
88

99
"openjdk11": {"name": "openjdk", "version": "11.0.3+7", "platformspecific": true },
1010
"oraclejdk11": {"name": "oraclejdk", "version": "11.0.6+8", "platformspecific": true },
11-
"labsjdk-ce-11": {"name": "labsjdk", "version": "ce-11.0.10+8-jvmci-21.0-b06", "platformspecific": true },
12-
"labsjdk-ee-11": {"name": "labsjdk", "version": "ee-11.0.10+8-jvmci-21.0-b06", "platformspecific": true },
11+
"labsjdk-ce-11": {"name": "labsjdk", "version": "ce-11.0.10+9-jvmci-21.1-b01", "platformspecific": true },
12+
"labsjdk-ee-11": {"name": "labsjdk", "version": "ee-11.0.10+8-jvmci-21.1-b01", "platformspecific": true },
1313

14-
"oraclejdk15": {"name": "oraclejdk", "version": "15.0.1+6", "platformspecific": true },
15-
"labsjdk-ce-15": {"name": "labsjdk", "version": "ce-15.0.1+9-jvmci-21.0-b06", "platformspecific": true },
16-
"labsjdk-ce-15Debug": {"name": "labsjdk", "version": "ce-15.0.1+9-jvmci-21.0-b06-debug", "platformspecific": true },
17-
"labsjdk-ee-15": {"name": "labsjdk", "version": "ee-15.0.2+7-jvmci-21.0-b06", "platformspecific": true },
18-
"labsjdk-ee-15Debug": {"name": "labsjdk", "version": "ee-15.0.2+7-jvmci-21.0-b06-debug", "platformspecific": true }
14+
"oraclejdk16": {"name": "oraclejdk", "version": "16.0.1+4", "platformspecific": true },
15+
"labsjdk-ce-16": {"name": "labsjdk", "version": "ce-16+29-jvmci-21.1-b01", "platformspecific": true },
16+
"labsjdk-ce-16Debug": {"name": "labsjdk", "version": "ce-16+29-jvmci-21.1-b01-debug", "platformspecific": true },
17+
"labsjdk-ee-16": {"name": "labsjdk", "version": "ee-16.0.1+2-jvmci-21.1-b01", "platformspecific": true },
18+
"labsjdk-ee-16Debug": {"name": "labsjdk", "version": "ee-16.0.1+2-jvmci-21.1-b01-debug", "platformspecific": true }
1919
},
2020

2121
"COMMENT" : "The devkits versions reflect those used to build the JVMCI JDKs (e.g., see devkit_platform_revisions in <jdk>/make/conf/jib-profiles.js)",
2222
"devkits": {
2323
"windows-oraclejdk8": { "packages" : { "devkit:VS2017-15.9.16+1" : "==0" }},
2424
"windows-openjdk8": { "packages" : { "devkit:VS2017-15.5.5+1" : "==0" }},
2525
"windows-jdk11": { "packages" : { "devkit:VS2017-15.9.24+1" : "==0" }},
26-
"windows-jdk15": { "packages" : { "devkit:VS2019-16.5.3+1" : "==0" }}
26+
"windows-jdk16": { "packages" : { "devkit:VS2019-16.7.2+1" : "==1" }}
2727
},
28+
"deps": {
29+
"common": {
30+
"timelimit": "30:00",
31+
"environment": {
32+
"MX_PYTHON": "python3"
33+
},
34+
"packages": {
35+
"pip:logilab-common ": "==1.4.4",
36+
"pip:pylint": "==1.9.3",
37+
"pip:ninja_syntax": "==1.7.2"
38+
}
39+
},
2840

41+
"linux": {
42+
"packages": {
43+
"git": ">=1.8.3",
44+
"mercurial": ">=2.2",
45+
"apache/ant": ">=1.9.4"
46+
}
47+
},
48+
"COMMENT.darwin": [
49+
"Required to keep pylint happy on Darwin",
50+
"https://coderwall.com/p/-k_93g/mac-os-x-valueerror-unknown-locale-utf-8-in-python"
51+
],
52+
"darwin": {
53+
"environment": {
54+
"LC_ALL": "en_US.UTF-8"
55+
}
56+
},
57+
"windows": {
58+
}
59+
60+
},
61+
"downloads": {
62+
"eclipse": {
63+
"downloads": {
64+
"ECLIPSE": {
65+
"name": "eclipse",
66+
"version": "4.14.0",
67+
"platformspecific": true
68+
}
69+
},
70+
"environment": {
71+
"ECLIPSE_EXE": "$ECLIPSE/eclipse"
72+
}
73+
},
74+
"jdt": {
75+
"downloads": {
76+
"JDT": {
77+
"name": "ecj",
78+
"version": "4.14.0",
79+
"platformspecific": false
80+
}
81+
}
82+
}
83+
},
2984
"sulong": {
3085
"deps": {
3186
"linux": {
@@ -37,6 +92,11 @@
3792
"packages": {
3893
"cmake": "==3.15.2"
3994
}
95+
},
96+
"windows": {
97+
"packages": {
98+
"msvc": "==10.0"
99+
}
40100
}
41101
}
42102
}

mx.truffleruby/suite.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
"name": "regex",
99
"subdir": True,
10-
"version": "fd344ebb6fd78982f8a316e8567d34af1a0943c2",
10+
"version": "71f5012eafd5b62809432c5006d61913b02f5d64",
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": "fd344ebb6fd78982f8a316e8567d34af1a0943c2",
19+
"version": "71f5012eafd5b62809432c5006d61913b02f5d64",
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)