[GR-21590] Update imports

PullRequest: graalpython/3991

Author: otethal

ci/graal/ci/common.jsonnet

@@ -323,6 +323,24 @@ local common_json = import "../common.json";
       },
     },
 
+    wasm_ol8:: {
+      downloads+: {
+        WABT_DIR: {name: 'wabt', version: '1.0.36-ol8', platformspecific: true},
+      },
+      environment+: {
+        WABT_DIR: '$WABT_DIR/bin',
+      },
+    },
+
+    emsdk_ol8:: {
+      downloads+: {
+        EMSDK_DIR: {name: 'emsdk', version: '4.0.10', platformspecific: true},
+      },
+      environment+: {
+        EMCC_DIR: '$EMSDK_DIR/upstream/emscripten/'
+      }
+    },
+
     fastr:: {
       # Note: On both Linux and MacOS, FastR depends on the gnur module and on gfortran
       # of a specific version (4.8.5 on Linux, 10.2.0 on MacOS)

ci/graal/common.json

@@ -52,15 +52,15 @@
     "labsjdk-ee-25":      {"name": "labsjdk",   "version": "ee-25+30-jvmci-b01", "platformspecific": true },
     "labsjdk-ee-25Debug": {"name": "labsjdk",   "version": "ee-25+30-jvmci-b01-debug", "platformspecific": true },
     "labsjdk-ee-25-llvm": {"name": "labsjdk",   "version": "ee-25+30-jvmci-b01-sulong", "platformspecific": true },
-    "graalvm-ee-25-ea":   {"name": "graalvm-jdk", "version": "25.0.0", "ea": "35", "platformspecific": true },
+    "graalvm-ee-25-ea":   {"name": "graalvm-jdk", "version": "25.0.0", "ea": "36", "platformspecific": true },
 
-    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "26",      "build_id": "jdk-26+12", "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-26+12-jvmci-b01", "platformspecific": true },
-    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-26+12-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-26+12-jvmci-b01-sulong", "platformspecific": true },
-    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-26+12-jvmci-b01", "platformspecific": true },
-    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-26+12-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-26+12-jvmci-b01-sulong", "platformspecific": true }
+    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "26",      "build_id": "jdk-26+13", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-26+13-jvmci-b01", "platformspecific": true },
+    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-26+13-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-26+13-jvmci-b01-sulong", "platformspecific": true },
+    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-26+13-jvmci-b01", "platformspecific": true },
+    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-26+13-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-26+13-jvmci-b01-sulong", "platformspecific": true }
   },
 
   "eclipse": {

mx.graalpython/mx_graalpython.py

@@ -290,18 +290,22 @@ def libpythonvm_build_args():
     ):
         vc = SUITE.vc
         commit = str(vc.tip(SUITE.dir)).strip()
-        branch = str(vc.active_branch(SUITE.dir)).strip()
-        if shutil.which("artifact_download"):
+        try:
+            branch = str(vc.active_branch(SUITE.dir)).strip()
+        except Exception: # pylint: disable=broad-except
+            branch = "master"
+
+        if script := os.environ.get("ARTIFACT_DOWNLOAD_SCRIPT"):
             # This is always available in the GraalPy CI
             profile = "cached_profile.iprof.gz"
             run(
                 [
-                    "artifact_download",
+                    sys.executable,
+                    script,
                     f"graalpy/{commit}",
                     profile,
                 ],
                 nonZeroIsFatal=False,
-                env={"UPLOADER_PYTHON": sys.executable, **os.environ},
             )
         else:
             # Locally, we try to get a reasonable profile
@@ -415,10 +419,11 @@ def graalpy_native_pgo_build_and_test(args=None):
         shutil.copyfileobj(f_in, f_out)
     mx.log(mx.colorize(f"[PGO] Gzipped profile at: {iprof_gz_path}", color="yellow"))
 
-    if shutil.which("artifact_uploader"):
+    if script := os.environ.get("ARTIFACT_UPLOADER_SCRIPT"):
         run(
             [
-                "artifact_uploader",
+                sys.executable,
+                script,
                 iprof_gz_path,
                 str(SUITE.vc.tip(SUITE.dir)).strip(),
                 "graalpy",
@@ -427,7 +432,6 @@ def graalpy_native_pgo_build_and_test(args=None):
                 "--artifact-repo-key",
                 os.environ.get("ARTIFACT_REPO_KEY_LOCATION"),
             ],
-            env={"UPLOADER_PYTHON": sys.executable, **os.environ},
         )
 
     if args is None:

mx.graalpython/suite.py

@@ -53,15 +53,15 @@
             },
             {
                 "name": "tools",
-                "version": "f33952320bee9cf00e56a98760cd7ad4f5647466",
+                "version": "4fd24a68f4295f6c920555630edebe5700e80902",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ],
             },
             {
                 "name": "regex",
-                "version": "f33952320bee9cf00e56a98760cd7ad4f5647466",
+                "version": "4fd24a68f4295f6c920555630edebe5700e80902",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},