Skip to content

Commit 90df704

Browse files
committed
Update imports
1 parent fc07038 commit 90df704

File tree

3 files changed

+28
-10
lines changed

3 files changed

+28
-10
lines changed

ci/graal/ci/common.jsonnet

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,24 @@ local common_json = import "../common.json";
323323
},
324324
},
325325

326+
wasm_ol8:: {
327+
downloads+: {
328+
WABT_DIR: {name: 'wabt', version: '1.0.36-ol8', platformspecific: true},
329+
},
330+
environment+: {
331+
WABT_DIR: '$WABT_DIR/bin',
332+
},
333+
},
334+
335+
emsdk_ol8:: {
336+
downloads+: {
337+
EMSDK_DIR: {name: 'emsdk', version: '4.0.10', platformspecific: true},
338+
},
339+
environment+: {
340+
EMCC_DIR: '$EMSDK_DIR/upstream/emscripten/'
341+
}
342+
},
343+
326344
fastr:: {
327345
# Note: On both Linux and MacOS, FastR depends on the gnur module and on gfortran
328346
# of a specific version (4.8.5 on Linux, 10.2.0 on MacOS)

ci/graal/common.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@
5252
"labsjdk-ee-25": {"name": "labsjdk", "version": "ee-25+30-jvmci-b01", "platformspecific": true },
5353
"labsjdk-ee-25Debug": {"name": "labsjdk", "version": "ee-25+30-jvmci-b01-debug", "platformspecific": true },
5454
"labsjdk-ee-25-llvm": {"name": "labsjdk", "version": "ee-25+30-jvmci-b01-sulong", "platformspecific": true },
55-
"graalvm-ee-25-ea": {"name": "graalvm-jdk", "version": "25.0.0", "ea": "35", "platformspecific": true },
55+
"graalvm-ee-25-ea": {"name": "graalvm-jdk", "version": "25.0.0", "ea": "36", "platformspecific": true },
5656

57-
"oraclejdk-latest": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+12", "platformspecific": true, "extrabundles": ["static-libs"]},
58-
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-26+12-jvmci-b01", "platformspecific": true },
59-
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-26+12-jvmci-b01-debug", "platformspecific": true },
60-
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-26+12-jvmci-b01-sulong", "platformspecific": true },
61-
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-26+12-jvmci-b01", "platformspecific": true },
62-
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-26+12-jvmci-b01-debug", "platformspecific": true },
63-
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-26+12-jvmci-b01-sulong", "platformspecific": true }
57+
"oraclejdk-latest": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+13", "platformspecific": true, "extrabundles": ["static-libs"]},
58+
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-26+13-jvmci-b01", "platformspecific": true },
59+
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-26+13-jvmci-b01-debug", "platformspecific": true },
60+
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-26+13-jvmci-b01-sulong", "platformspecific": true },
61+
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-26+13-jvmci-b01", "platformspecific": true },
62+
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-26+13-jvmci-b01-debug", "platformspecific": true },
63+
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-26+13-jvmci-b01-sulong", "platformspecific": true }
6464
},
6565

6666
"eclipse": {

mx.graalpython/suite.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@
5353
},
5454
{
5555
"name": "tools",
56-
"version": "f33952320bee9cf00e56a98760cd7ad4f5647466",
56+
"version": "4fd24a68f4295f6c920555630edebe5700e80902",
5757
"subdir": True,
5858
"urls": [
5959
{"url": "https://github.com/oracle/graal", "kind": "git"},
6060
],
6161
},
6262
{
6363
"name": "regex",
64-
"version": "f33952320bee9cf00e56a98760cd7ad4f5647466",
64+
"version": "4fd24a68f4295f6c920555630edebe5700e80902",
6565
"subdir": True,
6666
"urls": [
6767
{"url": "https://github.com/oracle/graal", "kind": "git"},

0 commit comments

Comments
 (0)