Skip to content

[GR-59303] Delegate suite release metadata to the sdk suite. #843

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
graalvmbot wants to merge 2 commits into from
Closed

[GR-59303] Delegate suite release metadata to the sdk suite. #843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec17007
Update imports
ansalond May 13, 2026
74d0b53
Delegate suite release metadata to the sdk suite.
ansalond May 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ci/graal/ci/common.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion ci/graal/common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
8 changes: 4 additions & 4 deletions mx.graalpython/mx_graalpython.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down Expand Up @@ -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(".", "")
Expand Down Expand Up @@ -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 = {
Expand Down
8 changes: 4 additions & 4 deletions mx.graalpython/suite.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",

Expand Down Expand Up @@ -53,15 +53,15 @@
},
{
"name": "tools",
"version": "6eb90f1ca8ea93cb3dca39a5cdd7e492cfb721fd",
"version": "a756965c3f49d230c4c991a948c87ea172209e5d",
"subdir": True,
"urls": [
{"url": "https://github.com/oracle/graal", "kind": "git"},
],
},
{
"name": "regex",
"version": "6eb90f1ca8ea93cb3dca39a5cdd7e492cfb721fd",
"version": "a756965c3f49d230c4c991a948c87ea172209e5d",
"subdir": True,
"urls": [
{"url": "https://github.com/oracle/graal", "kind": "git"},
Expand Down
Loading