Skip to content

Commit c509d37

Browse files
tzezulaansalond
authored andcommitted
Disable version check for Truffle LTS gates.
1 parent 40bd64c commit c509d37

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

truffle/external_repos/simplelanguage/standalone/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@
121121
<executable>
122122
${env.JAVA_HOME}/bin/native-image</executable>
123123
<commandlineArgs>
124+
-Dpolyglotimpl.DisableVersionChecks=true
124125
-p %classpath
125126
-H:+ReportExceptionStackTraces
126127
-m ${launcherClass}

truffle/mx.truffle/mx_truffle.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,9 @@ def _native_image_sl(jdk, vm_args, target_dir, use_optimized_runtime=True, use_e
448448
else:
449449
native_image_args += ["--module", "org.graalvm.sl_launcher/com.oracle.truffle.sl.launcher.SLMain"]
450450
native_image_args += [target_path]
451+
# GR-65661: we need to disable the check in GraalVM for 21 as it does not allow polyglot version 26.0.0-dev
452+
if jdk.version < mx.VersionSpec("25"):
453+
native_image_args = ['-Dpolyglotimpl.DisableVersionChecks=true'] + native_image_args
451454
mx.log("Running {} {}".format(mx.exe_suffix('native-image'), " ".join(native_image_args)))
452455
mx.run([native_image_path] + native_image_args)
453456
return target_path
@@ -675,6 +678,9 @@ def collect_unittest_distributions(test_deps, vm_launcher, vm_args):
675678
f'-Djunit.platform.listeners.uid.tracking.output.dir={os.path.join(tmp, "test-ids")}'
676679
]
677680
vm_args = enable_asserts_args + uid_tracking_args + mx.get_runtime_jvm_args(names=unittest_distributions + truffle_runtime_distributions) + module_args
681+
# GR-65661: we need to disable the check in GraalVM for 21 as it does not allow polyglot version 26.0.0-dev
682+
if jdk.version < mx.VersionSpec("25"):
683+
vm_args = ['-Dpolyglotimpl.DisableVersionChecks=true'] + vm_args
678684

679685
# 2. Collect test ids for a native image build
680686
junit_console_launcher_with_args = [

0 commit comments

Comments
 (0)