[GR-65634] [GR-65661] Start 26.0.0 dev cycle.

ansalond · ansalond · commit f321c302e683 · 2025-06-11T13:35:35.000Z
PullRequest: graal/21032
diff --git a/compiler/mx.compiler/suite.py b/compiler/mx.compiler/suite.py
@@ -4,7 +4,7 @@
   "sourceinprojectwhitelist" : [],
 
   "groupId" : "org.graalvm.compiler",
-  "version" : "25.0.0",
+  "version" : "26.0.0",
   "release" : False,
   "url" : "http://www.graalvm.org/",
   "developer" : {
diff --git a/espresso-shared/mx.espresso-shared/suite.py b/espresso-shared/mx.espresso-shared/suite.py
@@ -25,7 +25,7 @@
 suite = {
     "mxversion": "7.38.0",
     "name": "espresso-shared",
-    "version" : "25.0.0",
+    "version" : "26.0.0",
     "release" : False,
     "groupId" : "org.graalvm.espresso",
     "url" : "https://www.graalvm.org/reference-manual/java-on-truffle/",
diff --git a/espresso/mx.espresso/suite.py b/espresso/mx.espresso/suite.py
@@ -24,7 +24,7 @@
 suite = {
     "mxversion": "7.46.0",
     "name": "espresso",
-    "version" : "25.0.0",
+    "version" : "26.0.0",
     "release" : False,
     "groupId" : "org.graalvm.espresso",
     "url" : "https://www.graalvm.org/reference-manual/java-on-truffle/",
diff --git a/regex/mx.regex/suite.py b/regex/mx.regex/suite.py
@@ -43,7 +43,7 @@
 
   "name" : "regex",
 
-  "version" : "25.0.0",
+  "version" : "26.0.0",
   "release" : False,
   "groupId" : "org.graalvm.regex",
   "url" : "http://www.graalvm.org/",
diff --git a/sdk/mx.sdk/mx_sdk_vm_ng.py b/sdk/mx.sdk/mx_sdk_vm_ng.py
@@ -424,6 +424,10 @@ def get_build_args(self):
             experimental_build_args.append('-H:+VerifyRuntimeCompilationFrameStates')
         build_args = []
 
+        # GR-65661: we need to disable the check in GraalVM for 21 as it does not allow polyglot version 26.0.0-dev
+        if get_bootstrap_graalvm_version() < mx.VersionSpec("25"):
+            build_args += ['-Dpolyglotimpl.DisableVersionChecks=true']
+
         canonical_name = self.subject.base_file_name()
         profiles = mx_sdk_vm_impl._image_profiles(canonical_name)
         if profiles:
diff --git a/sdk/mx.sdk/suite.py b/sdk/mx.sdk/suite.py
@@ -41,7 +41,7 @@
 suite = {
   "mxversion": "7.54.5",
   "name" : "sdk",
-  "version" : "25.0.0",
+  "version" : "26.0.0",
   "release" : False,
   "sourceinprojectwhitelist" : [],
   "url" : "https://github.com/oracle/graal",
diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
@@ -2,7 +2,7 @@
 suite = {
     "mxversion": "7.38.0",
     "name": "substratevm",
-    "version" : "25.0.0",
+    "version" : "26.0.0",
     "release" : False,
     "url" : "https://github.com/oracle/graal/tree/master/substratevm",
 
diff --git a/sulong/mx.sulong/suite.py b/sulong/mx.sulong/suite.py
@@ -1,7 +1,7 @@
 suite = {
   "mxversion": "7.48.0",
   "name" : "sulong",
-  "version" : "25.0.0",
+  "version" : "26.0.0",
   "release" : False,
   "versionConflictResolution" : "latest",
   "groupId": "org.graalvm.llvm",
diff --git a/tools/mx.tools/suite.py b/tools/mx.tools/suite.py
@@ -26,7 +26,7 @@
     "defaultLicense" : "GPLv2-CPE",
 
     "groupId" : "org.graalvm.tools",
-    "version" : "25.0.0",
+    "version" : "26.0.0",
     "release" : False,
     "url" : "http://openjdk.java.net/projects/graal",
     "developer" : {
diff --git a/truffle/external_repos/simplelanguage/pom.xml b/truffle/external_repos/simplelanguage/pom.xml
@@ -47,7 +47,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <m2e.apt.activation>jdt_apt</m2e.apt.activation>
-    <graalvm.version>25.0.0-dev</graalvm.version>
+    <graalvm.version>26.0.0-dev</graalvm.version>
     <maven.compiler.source>17</maven.compiler.source>
     <maven.compiler.target>17</maven.compiler.target>
     <launcherClass>org.graalvm.sl.launcher/com.oracle.truffle.sl.launcher.SLMain</launcherClass>
diff --git a/truffle/external_repos/simplelanguage/standalone/pom.xml b/truffle/external_repos/simplelanguage/standalone/pom.xml
@@ -121,6 +121,7 @@
                                     <executable>
                                         ${env.JAVA_HOME}/bin/native-image</executable>
                                     <commandlineArgs>
+                                        -Dpolyglotimpl.DisableVersionChecks=true
                                         -p %classpath
                                         -H:+ReportExceptionStackTraces
                                         -m ${launcherClass}
diff --git a/truffle/external_repos/simpletool/pom.xml b/truffle/external_repos/simpletool/pom.xml
@@ -48,7 +48,7 @@
     <version>${graalvm.version}</version>
     <name>simpletool</name>
     <properties>
-        <graalvm.version>25.0.0-dev</graalvm.version>
+        <graalvm.version>26.0.0-dev</graalvm.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
diff --git a/truffle/mx.truffle/mx_truffle.py b/truffle/mx.truffle/mx_truffle.py
@@ -448,6 +448,9 @@ def _native_image_sl(jdk, vm_args, target_dir, use_optimized_runtime=True, use_e
     else:
         native_image_args += ["--module", "org.graalvm.sl_launcher/com.oracle.truffle.sl.launcher.SLMain"]
     native_image_args += [target_path]
+    # GR-65661: we need to disable the check in GraalVM for 21 as it does not allow polyglot version 26.0.0-dev
+    if jdk.version < mx.VersionSpec("25"):
+        native_image_args = ['-Dpolyglotimpl.DisableVersionChecks=true'] + native_image_args
     mx.log("Running {} {}".format(mx.exe_suffix('native-image'), " ".join(native_image_args)))
     mx.run([native_image_path] + native_image_args)
     return target_path
@@ -675,6 +678,9 @@ def collect_unittest_distributions(test_deps, vm_launcher, vm_args):
             f'-Djunit.platform.listeners.uid.tracking.output.dir={os.path.join(tmp, "test-ids")}'
         ]
         vm_args = enable_asserts_args + uid_tracking_args + mx.get_runtime_jvm_args(names=unittest_distributions + truffle_runtime_distributions) + module_args
+        # GR-65661: we need to disable the check in GraalVM for 21 as it does not allow polyglot version 26.0.0-dev
+        if jdk.version < mx.VersionSpec("25"):
+            vm_args = ['-Dpolyglotimpl.DisableVersionChecks=true'] + vm_args
 
         # 2. Collect test ids for a native image build
         junit_console_launcher_with_args = [
diff --git a/truffle/mx.truffle/suite.py b/truffle/mx.truffle/suite.py
@@ -41,7 +41,7 @@
 suite = {
   "mxversion": "7.33.0",
   "name" : "truffle",
-  "version" : "25.0.0",
+  "version" : "26.0.0",
   "release" : False,
   "groupId" : "org.graalvm.truffle",
   "sourceinprojectwhitelist" : [],
diff --git a/vm/mx.vm/suite.py b/vm/mx.vm/suite.py
@@ -1,6 +1,6 @@
 suite = {
     "name": "vm",
-    "version" : "25.0.0",
+    "version" : "26.0.0",
     "mxversion": "7.34.1",
     "release" : False,
     "groupId" : "org.graalvm",
@@ -33,7 +33,7 @@
                 "name": "graal-nodejs",
                 "subdir": True,
                 "dynamic": True,
-                "version": "a79db34159cdefd5e3367b072278cd4de74ce444",
+                "version": "ebb056ffe3b906696101bcc4ccc5efa4a3e96066",
                 "urls" : [
                     {"url" : "https://github.com/graalvm/graaljs.git", "kind" : "git"},
                 ]
@@ -42,14 +42,14 @@
                 "name": "graal-js",
                 "subdir": True,
                 "dynamic": True,
-                "version": "a79db34159cdefd5e3367b072278cd4de74ce444",
+                "version": "ebb056ffe3b906696101bcc4ccc5efa4a3e96066",
                 "urls": [
                     {"url": "https://github.com/graalvm/graaljs.git", "kind" : "git"},
                 ]
             },
             {
                 "name": "truffleruby",
-                "version": "e369f61d9067e94f553c4c4837d0aed28f6ff630",
+                "version": "00298360f4c9a6787210a278808738740c9e65a7",
                 "dynamic": True,
                 "urls": [
                     {"url": "https://github.com/oracle/truffleruby.git", "kind": "git"},
@@ -65,7 +65,7 @@
             },
             {
                 "name": "graalpython",
-                "version": "b79401c1fe370b385a72aaa5a29bbe1db504427e",
+                "version": "5e846266a4dd6e1796a41faa9768bbd37eed322a",
                 "dynamic": True,
                 "urls": [
                     {"url": "https://github.com/graalvm/graalpython.git", "kind": "git"},
diff --git a/wasm/mx.wasm/suite.py b/wasm/mx.wasm/suite.py
@@ -42,7 +42,7 @@
   "mxversion": "7.33.0",
   "name" : "wasm",
   "groupId" : "org.graalvm.wasm",
-  "version" : "25.0.0",
+  "version" : "26.0.0",
   "release" : False,
   "versionConflictResolution" : "latest",
   "url" : "http://graalvm.org/webassembly",
