Skip to content

Commit 21f46b3

Browse files
OracleLabsAutomationelkorchi
authored andcommitted
[GR-63474] Backport to 24.2: Update to latest graal to test JCodings update
PullRequest: truffleruby/4501
2 parents 50a8933 + 298fc04 commit 21f46b3

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

ci/common.jsonnet

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,8 @@ local common_json = import "../common.json";
152152
"@(?P<filename>.*SubprocessUtil-argfiles.*\\.argfile)",
153153
# Keep in sync with com.oracle.truffle.api.test.SubprocessTestUtils#makeArgfile
154154
"@(?P<filename>.*SubprocessTestUtils-argfiles.*\\.argfile)",
155+
# Keep in sync with mx_gate.py:get_jacoco_agent_args
156+
"JaCoCo agent config: '(?P<filename>[^']+)'",
155157
],
156158
},
157159

@@ -284,7 +286,7 @@ local common_json = import "../common.json";
284286
if (self.os == "linux" && self.arch == "amd64") then {
285287
readline: '==6.3',
286288
pcre2: '==10.37',
287-
curl: '>=7.50.1',
289+
curl: '==7.50.1',
288290
gnur: '==4.0.3-gcc4.8.5-pcre2',
289291
}
290292
else if (self.os == "darwin" && self.arch == "amd64") then {

common.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@
4545

4646
"oraclejdk23": {"name": "jpg-jdk", "version": "23", "build_id": "jdk-23+37", "platformspecific": true, "extrabundles": ["static-libs"]},
4747

48-
"oraclejdk-latest": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24+36", "platformspecific": true, "extrabundles": ["static-libs"]},
49-
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-24+36-jvmci-b01", "platformspecific": true },
50-
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-24+36-jvmci-b01-debug", "platformspecific": true },
51-
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-24+36-jvmci-b01-sulong", "platformspecific": true },
52-
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-24+36-jvmci-b01", "platformspecific": true },
53-
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-24+36-jvmci-b01-debug", "platformspecific": true },
54-
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-24+36-jvmci-b01-sulong", "platformspecific": true }
48+
"oraclejdk-latest": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24.0.1+9", "platformspecific": true, "extrabundles": ["static-libs"]},
49+
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-24.0.1+9-jvmci-b01", "platformspecific": true },
50+
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-24.0.1+9-jvmci-b01-debug", "platformspecific": true },
51+
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-24.0.1+9-jvmci-b01-sulong", "platformspecific": true },
52+
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-24.0.1+9-jvmci-b01", "platformspecific": true },
53+
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-24.0.1+9-jvmci-b01-debug", "platformspecific": true },
54+
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-24.0.1+9-jvmci-b01-sulong", "platformspecific": true }
5555
},
5656

5757
"eclipse": {

mx.truffleruby/suite.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
{
2323
"name": "regex",
2424
"subdir": True,
25-
"version": "c9096be682f7aa67f5133fb098762e2152ff355f",
25+
"version": "ac0634be605490b078fb48a362a73f3afbef86ce",
2626
"urls": [
2727
{"url": "https://github.com/oracle/graal.git", "kind": "git"},
2828
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -31,7 +31,7 @@
3131
{
3232
"name": "sulong",
3333
"subdir": True,
34-
"version": "c9096be682f7aa67f5133fb098762e2152ff355f",
34+
"version": "ac0634be605490b078fb48a362a73f3afbef86ce",
3535
"urls": [
3636
{"url": "https://github.com/oracle/graal.git", "kind": "git"},
3737
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

0 commit comments

Comments
 (0)