From e8f8c61d047955cd8a2ae43a670e586187d601f8 Mon Sep 17 00:00:00 2001 From: ol-automation_ww Date: Fri, 18 Oct 2024 21:06:01 +0000 Subject: [PATCH] Update graal import. --- ci/common.jsonnet | 9 +++++++++ common.json | 2 +- mx.truffleruby/suite.py | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ci/common.jsonnet b/ci/common.jsonnet index b9feda18abb2..d2ef2c435725 100644 --- a/ci/common.jsonnet +++ b/ci/common.jsonnet @@ -259,6 +259,15 @@ local common_json = import "../common.json"; } else {}, }, + wasm:: { + downloads+: { + WABT_DIR: {name: 'wabt', version: '1.0.36', platformspecific: true}, + }, + environment+: { + WABT_DIR: '$WABT_DIR/bin', + }, + }, + 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) diff --git a/common.json b/common.json index 026f2d2be635..07cde52ac3d6 100644 --- a/common.json +++ b/common.json @@ -4,7 +4,7 @@ "Jsonnet files should not include this file directly but use ci/common.jsonnet instead." ], - "mx_version": "7.33.0", + "mx_version": "7.33.1", "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet", "jdks": { diff --git a/mx.truffleruby/suite.py b/mx.truffleruby/suite.py index a62511c00b7b..8ddb7cd61596 100644 --- a/mx.truffleruby/suite.py +++ b/mx.truffleruby/suite.py @@ -20,7 +20,7 @@ { "name": "regex", "subdir": True, - "version": "6458bd1f8ccf76e072c092c2445f78cbd931fcca", + "version": "ce344dd45cc746790b06bc572086a922b2ae328c", "urls": [ {"url": "https://github.com/oracle/graal.git", "kind": "git"}, {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"}, @@ -29,7 +29,7 @@ { "name": "sulong", "subdir": True, - "version": "6458bd1f8ccf76e072c092c2445f78cbd931fcca", + "version": "ce344dd45cc746790b06bc572086a922b2ae328c", "urls": [ {"url": "https://github.com/oracle/graal.git", "kind": "git"}, {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},