Skip to content

Commit 2d9e7d8

Browse files
OracleLabsAutomationOracleLabsAutomation
committed
Update graal import.
1 parent 0c315d2 commit 2d9e7d8

File tree

3 files changed

+43
-48
lines changed

3 files changed

+43
-48
lines changed

‎ci/common.jsonnet

Lines changed: 29 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is shared between many repositories.
22
# All objects defined here are mixins, so you can use them like:
3-
# myjob: common.linux_amd64 + common.jdks.labsjdk17ce + common.deps.sulong + ...
3+
# { name: "myjob" } + common.linux_amd64 + common.jdks.labsjdk17ce + common.deps.sulong + ...
44
# Note that using a os-arch mixin like linux_amd64 mixin is required for using common.deps.
55

66
local common_json = import "../common.json";
@@ -57,6 +57,8 @@ local common_json = import "../common.json";
5757
"linux-jdk20": { packages+: { "devkit:gcc11.2.0-OL6.4+1": "==0" }},
5858
},
5959

60+
# Dependencies
61+
# ************
6062
deps: {
6163
eclipse: {
6264
downloads+: {
@@ -161,26 +163,18 @@ local common_json = import "../common.json";
161163
},
162164
},
163165

164-
local deps_linux = {
165-
packages+: {
166-
git: ">=1.8.3",
167-
},
168-
},
169-
local deps_darwin = {
170-
},
171-
local deps_windows = {
172-
},
173-
174-
local catch_files = [
175-
# Keep in sync with org.graalvm.compiler.debug.StandardPathUtilitiesProvider#DIAGNOSTIC_OUTPUT_DIRECTORY_MESSAGE_REGEXP
176-
"Graal diagnostic output saved in '(?P<filename>[^']+)'",
177-
# Keep in sync with org.graalvm.compiler.debug.DebugContext#DUMP_FILE_MESSAGE_REGEXP
178-
"Dumping debug output to '(?P<filename>[^']+)'",
179-
# Keep in sync with com.oracle.svm.hosted.NativeImageOptions#DEFAULT_ERROR_FILE_NAME
180-
" (?P<filename>.+/svm_err_b_\\d+T\\d+\\.\\d+_pid\\d+\\.md)",
181-
],
182-
183-
# Included in common
166+
# Hardware definitions and common fields
167+
# **************************************
168+
# Note that only platforms (os-arch) are exposed (not os and arch separately),
169+
# because this is the simplest way to ensure correct usage and dependencies (e.g. ol7 in linux_amd64).
170+
#
171+
# To add extra "common" fields for your CI:
172+
# * If you already have platforms objects, you could extend them like:
173+
# linux_amd64: common.linux_amd64 + self.my_common,
174+
# * Otherwise, just include your common object as well as one of the os-arch objects below in each job:
175+
# { name: "myjob" } + common.linux_amd64 + self.my_common + ...
176+
#
177+
# This also means self.my_common should no longer include mx, etc as it is already included by the os-arch objects.
184178
local mx = {
185179
environment+: {
186180
MX_PYTHON: "python3.8",
@@ -193,20 +187,15 @@ local common_json = import "../common.json";
193187
python_version: "3", # To use the correct virtualenv
194188
},
195189

196-
# Hardware definitions
197-
# ********************
198-
# Note that only platforms (os-arch) are exposed (not os and arch separately),
199-
# because this is the simplest way to ensure correct usage and dependencies (e.g. ol7 in linux_amd64).
200-
# If you want to add extra "common" things for your CI, just define your own objects like:
201-
# linux_amd64: common.linux_amd64 + extras,
202190
local common = mx + {
203-
local where = if std.objectHas(self, "name") then " in " + self.name else "",
204-
# enforce self.os (useful for generating job names)
205-
os:: error "self.os not set" + where,
206-
# enforce self.arch (useful for generating job names)
207-
arch:: error "self.arch not set" + where,
208-
capabilities+: [],
209-
catch_files+: catch_files,
191+
catch_files+: [
192+
# Keep in sync with org.graalvm.compiler.debug.StandardPathUtilitiesProvider#DIAGNOSTIC_OUTPUT_DIRECTORY_MESSAGE_REGEXP
193+
"Graal diagnostic output saved in '(?P<filename>[^']+)'",
194+
# Keep in sync with org.graalvm.compiler.debug.DebugContext#DUMP_FILE_MESSAGE_REGEXP
195+
"Dumping debug output to '(?P<filename>[^']+)'",
196+
# Keep in sync with com.oracle.svm.hosted.NativeImageOptions#DEFAULT_ERROR_FILE_NAME
197+
" (?P<filename>.+/svm_err_b_\\d+T\\d+\\.\\d+_pid\\d+\\.md)",
198+
],
210199
},
211200

212201
local ol7 = {
@@ -215,6 +204,12 @@ local common_json = import "../common.json";
215204
mount_modules: true,
216205
},
217206
},
207+
local deps_linux = {
208+
},
209+
local deps_darwin = {
210+
},
211+
local deps_windows = {
212+
},
218213

219214
local linux = deps_linux + common + { os:: "linux", capabilities+: [self.os] },
220215
local darwin = deps_darwin + common + { os:: "darwin", capabilities+: [self.os] },

‎common.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
"oraclejdk11": {"name": "jpg-jdk", "version": "11.0.11", "build_id": "9", "release": true, "platformspecific": true, "extrabundles": ["static-libs"] },
1212

1313
"oraclejdk17": {"name": "jpg-jdk", "version": "17.0.1", "build_id": "12", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
14-
"labsjdk-ee-17": {"name": "labsjdk", "version": "ee-17.0.6+9-jvmci-23.0-b07", "platformspecific": true },
15-
"labsjdk-ee-17Debug": {"name": "labsjdk", "version": "ee-17.0.6+9-jvmci-23.0-b07-debug", "platformspecific": true },
16-
"labsjdk-ee-17-llvm": {"name": "labsjdk", "version": "ee-17.0.6+9-jvmci-23.0-b07-sulong", "platformspecific": true },
17-
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.6+10-jvmci-23.0-b07", "platformspecific": true },
18-
"labsjdk-ce-17Debug": {"name": "labsjdk", "version": "ce-17.0.6+10-jvmci-23.0-b07-debug", "platformspecific": true },
19-
"labsjdk-ce-17-llvm": {"name": "labsjdk", "version": "ce-17.0.6+10-jvmci-23.0-b07-sulong", "platformspecific": true },
14+
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.7+2-jvmci-23.0-b08", "platformspecific": true },
15+
"labsjdk-ce-17Debug": {"name": "labsjdk", "version": "ce-17.0.7+2-jvmci-23.0-b08-debug", "platformspecific": true },
16+
"labsjdk-ce-17-llvm": {"name": "labsjdk", "version": "ce-17.0.7+2-jvmci-23.0-b08-sulong", "platformspecific": true },
17+
"labsjdk-ee-17": {"name": "labsjdk", "version": "ee-17.0.7+5-jvmci-23.0-b08", "platformspecific": true },
18+
"labsjdk-ee-17Debug": {"name": "labsjdk", "version": "ee-17.0.7+5-jvmci-23.0-b08-debug", "platformspecific": true },
19+
"labsjdk-ee-17-llvm": {"name": "labsjdk", "version": "ee-17.0.7+5-jvmci-23.0-b08-sulong", "platformspecific": true },
2020

2121
"oraclejdk19": {"name": "jpg-jdk", "version": "19", "build_id": "26", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
2222
"labsjdk-ce-19": {"name": "labsjdk", "version": "ce-19.0.1+10-jvmci-23.0-b04", "platformspecific": true },
@@ -27,12 +27,12 @@
2727
"labsjdk-ee-19-llvm": {"name": "labsjdk", "version": "ee-19.0.2+7-jvmci-23.0-b05-sulong", "platformspecific": true },
2828

2929
"oraclejdk20": {"name": "jpg-jdk", "version": "20", "build_id": "24", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
30-
"labsjdk-ce-20": {"name": "labsjdk", "version": "ce-20+34-jvmci-23.0-b07", "platformspecific": true },
31-
"labsjdk-ce-20Debug": {"name": "labsjdk", "version": "ce-20+34-jvmci-23.0-b07-debug", "platformspecific": true },
32-
"labsjdk-ce-20-llvm": {"name": "labsjdk", "version": "ce-20+34-jvmci-23.0-b07-sulong", "platformspecific": true },
33-
"labsjdk-ee-20": {"name": "labsjdk", "version": "ee-20.0.1+4-jvmci-23.0-b07", "platformspecific": true },
34-
"labsjdk-ee-20Debug": {"name": "labsjdk", "version": "ee-20.0.1+4-jvmci-23.0-b07-debug", "platformspecific": true },
35-
"labsjdk-ee-20-llvm": {"name": "labsjdk", "version": "ee-20.0.1+4-jvmci-23.0-b07-sulong", "platformspecific": true }
30+
"labsjdk-ce-20": {"name": "labsjdk", "version": "ce-20+34-jvmci-23.0-b08", "platformspecific": true },
31+
"labsjdk-ce-20Debug": {"name": "labsjdk", "version": "ce-20+34-jvmci-23.0-b08-debug", "platformspecific": true },
32+
"labsjdk-ce-20-llvm": {"name": "labsjdk", "version": "ce-20+34-jvmci-23.0-b08-sulong", "platformspecific": true },
33+
"labsjdk-ee-20": {"name": "labsjdk", "version": "ee-20.0.1+6-jvmci-23.0-b08", "platformspecific": true },
34+
"labsjdk-ee-20Debug": {"name": "labsjdk", "version": "ee-20.0.1+6-jvmci-23.0-b08-debug", "platformspecific": true },
35+
"labsjdk-ee-20-llvm": {"name": "labsjdk", "version": "ee-20.0.1+6-jvmci-23.0-b08-sulong", "platformspecific": true }
3636
},
3737

3838
"eclipse": {

‎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": "8974a6693c2bb22146c8b1c36e9b4ee290c5becb",
10+
"version": "d72550cd8812992089076ef0bd6ec300c58fdc76",
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": "8974a6693c2bb22146c8b1c36e9b4ee290c5becb",
19+
"version": "d72550cd8812992089076ef0bd6ec300c58fdc76",
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)