Skip to content

[GR-70588] Include the GraalVM version rather than the Java version in the vendor version and basedir name. #12319

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

Merged
merged 2 commits into from
Oct 8, 2025
Merged

[GR-70588] Include the GraalVM version rather than the Java version in the vendor version and basedir name. #12319

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
270badf
Include the GraalVM version rather than the Java version in the vendo…
ansalond Oct 3, 2025
3d8bd95
The JDK type is not part of the base dir name.
ansalond Oct 8, 2025
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
46 changes: 26 additions & 20 deletions sdk/mx.sdk/mx_sdk_vm_impl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -906,13 +906,12 @@ def _get_graalvm_configuration(base_name, components=None, stage1=False):

if vm_dist_name is not None:
# Examples (later we call `.lower().replace('_', '-')`):
# GraalVM_community_openjdk_17.0.7+4.1
# GraalVM_jdk_17.0.7+4.1
# GraalVM_jit_jdk_17.0.7+4.1
base_dir = '{base_name}{vm_dist_name}_{jdk_type}_{version}'.format(
# GraalVM_community_25.1.0+36.1
# GraalVM_25.1.0+36.1
# GraalVM_jit_25.1.0+36.1
base_dir = '{base_name}{vm_dist_name}_{version}'.format(
base_name=base_name,
vm_dist_name=('_' + vm_dist_name) if vm_dist_name else '',
jdk_type='jdk' if mx_sdk_vm.ee_implementor() else 'openjdk',
version=graalvm_version(version_type='base-dir')
)
name_prefix = '{base_name}{vm_dist_name}_java{jdk_version}'.format(
Expand Down Expand Up @@ -2985,38 +2984,45 @@ def base_jdk_version_info():
raise mx.abort(f'VM info extraction failed. Exit code: {code}\nOutput: {out.data}')

if version_type == 'graalvm':
return _suite.release_version()
return _suite.release_version(snapshotSuffix='dev')
else:
graalvm_version = _suite.release_version(snapshotSuffix='dev')
if _base_jdk_version_info is None:
_base_jdk_version_info = base_jdk_version_info()

java_vnum, java_pre, java_build, _ = _base_jdk_version_info
_, java_pre, java_build, _ = _base_jdk_version_info
if version_type == 'vendor':
graalvm_pre = '' if _suite.is_release() else '-dev'
graalvm_suffix = ''
if java_pre:
graalvm_pre += '.' if graalvm_pre else '-'
graalvm_pre += java_pre
graalvm_suffix += '.' if graalvm_version.endsWith('dev') else '-'
graalvm_suffix += java_pre
else:
assert version_type == 'base-dir', version_type
graalvm_pre = ''
graalvm_suffix = ''
# Ignores `java_opt` (`Runtime.version().optional()`)
#
# Examples:
#
# GraalVM version: 25.1.0
# ```
# openjdk version "17.0.7" 2023-04-18
# OpenJDK Runtime Environment (build 17.0.7+4-jvmci-23.0-b10)
# $ java -version
# openjdk 25 2025-09-16
# OpenJDK Runtime Environment (build 25+36-3489)
# OpenJDK 64-Bit Server VM (build 25+36-3489, mixed mode, sharing)
# ```
# -> `17.0.7-dev+4.1`
# -> `25.1.0+36.1`
#
# GraalVM version: 25.1.0-dev
# ```
# openjdk version "21-ea" 2023-09-19
# OpenJDK Runtime Environment (build 21-ea+16-1326)
# $ java -version
# openjdk 25 2025-09-16
# OpenJDK Runtime Environment (build 25+36-3489)
# OpenJDK 64-Bit Server VM (build 25+36-3489, mixed mode, sharing)
# ```
# -> `21-dev.ea+16.1`
return '{java_vnum}{graalvm_pre}{java_build}.{release_build}'.format(
java_vnum=java_vnum,
graalvm_pre=graalvm_pre,
# -> `25.1.0-dev+36.1`
return '{graalvm_version}{graalvm_suffix}{java_build}.{release_build}'.format(
graalvm_version=graalvm_version,
graalvm_suffix=graalvm_suffix,
java_build=java_build,
release_build=mx_sdk_vm.release_build
)
Expand Down