diff --git a/ci/graal/ci/common.jsonnet b/ci/graal/ci/common.jsonnet index c31e836b4e..d12957a22c 100644 --- a/ci/graal/ci/common.jsonnet +++ b/ci/graal/ci/common.jsonnet @@ -301,7 +301,7 @@ local common_json = import "../common.json"; wasm:: { downloads+: { - WABT_DIR: {name: 'wabt', version: '1.0.37', platformspecific: true}, + WABT_DIR: {name: 'wabt', version: '1.0.41', platformspecific: true}, }, environment+: { WABT_DIR: '$WABT_DIR/bin', @@ -310,7 +310,7 @@ local common_json = import "../common.json"; wasm_ol8:: { downloads+: { - WABT_DIR: {name: 'wabt', version: '1.0.37-ol8', platformspecific: true}, + WABT_DIR: {name: 'wabt', version: '1.0.41-ol8', platformspecific: true}, }, environment+: { WABT_DIR: '$WABT_DIR/bin', diff --git a/ci/graal/common.json b/ci/graal/common.json index ece8a56eb9..66848d0102 100644 --- a/ci/graal/common.json +++ b/ci/graal/common.json @@ -4,7 +4,7 @@ "Jsonnet files should not include this file directly but use ci/common.jsonnet instead." ], - "mx_version": "7.81.0", + "mx_version": "7.82.0", "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet", "jdks": { diff --git a/mx.graalpython/mx_graalpython.py b/mx.graalpython/mx_graalpython.py index 9e47860b51..8392bc9d86 100644 --- a/mx.graalpython/mx_graalpython.py +++ b/mx.graalpython/mx_graalpython.py @@ -91,8 +91,9 @@ def get_boolean_env(name, default=False): SUITE_COMPILER = mx.suite("compiler", fatalIfMissing=False) GRAALPY_ABI_VERSION = 'graalpy250' -GRAAL_VERSION = SUITE.suiteDict['version'] -IS_RELEASE = SUITE.suiteDict['release'] +IS_RELEASE = SUITE.is_release() +FULL_GRAAL_VERSION = SUITE.release_version() +GRAAL_VERSION = FULL_GRAAL_VERSION if IS_RELEASE else FULL_GRAAL_VERSION[:-len('-dev')] GRAAL_VERSION_MAJ_MIN = ".".join(GRAAL_VERSION.split(".")[:2]) PYTHON_VERSION = SUITE.suiteDict[f'{SUITE.name}:pythonVersion'] PYTHON_VERSION_MAJ_MIN = ".".join(PYTHON_VERSION.split('.')[:2]) @@ -2007,7 +2008,6 @@ def py_version_short(variant=None, **_): else: return PYTHON_VERSION_MAJ_MIN - def graal_version_short(variant=None, **_): if variant == 'major_minor_nodot': return GRAAL_VERSION_MAJ_MIN.replace(".", "") @@ -2041,7 +2041,7 @@ def release_level(variant: Union[Literal['binary'], None]) -> str: ... def release_level(variant=None): # CPython has alpha, beta, candidate and final. We distinguish just two at the moment level = 'alpha' - if SUITE.suiteDict['release']: + if IS_RELEASE: level = 'final' if variant in ('binary', 'int'): level_num = { diff --git a/mx.graalpython/suite.py b/mx.graalpython/suite.py index feba14eeb2..45db0ab4fb 100644 --- a/mx.graalpython/suite.py +++ b/mx.graalpython/suite.py @@ -9,9 +9,9 @@ "name": "graalpython", "versionConflictResolution": "latest", - "version": "25.1.0", "graalpython:pythonVersion": "3.12.8", - "release": False, + "version_from": "sdk", + "release_from": "sdk", "groupId": "org.graalvm.python", "url": "http://www.graalvm.org/python", @@ -53,7 +53,7 @@ }, { "name": "tools", - "version": "6eb90f1ca8ea93cb3dca39a5cdd7e492cfb721fd", + "version": "a756965c3f49d230c4c991a948c87ea172209e5d", "subdir": True, "urls": [ {"url": "https://github.com/oracle/graal", "kind": "git"}, @@ -61,7 +61,7 @@ }, { "name": "regex", - "version": "6eb90f1ca8ea93cb3dca39a5cdd7e492cfb721fd", + "version": "a756965c3f49d230c4c991a948c87ea172209e5d", "subdir": True, "urls": [ {"url": "https://github.com/oracle/graal", "kind": "git"},