Upgrade to GraalVM JDK 23.0.2 and Truffle 24.1.2

hpi-swa · Jan 21, 2025 · 6afa3b0 · 6afa3b0
1 parent 9573417
commit 6afa3b0
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -155,7 +155,7 @@ jobs:
     - name: Set up Oracle GraalVM
       uses: graalvm/setup-graalvm@v1
       with:
-        java-version: '${{ env.JAVA_VERSION }}.0.1'
+        java-version: '${{ env.JAVA_VERSION }}.0.2'
         distribution: 'graalvm'
         github-token: ${{ secrets.GITHUB_TOKEN }}
       if: ${{ matrix.type == 'native' }}
@@ -201,7 +201,7 @@ jobs:
       run: 'trufflesqueak --code "(String streamContents: [:s | SystemReporter basicNew reportImage: s; reportVM: s; reportVMParameters: s]) withUnixLineEndings" images/test-64bit.image'
     - name: Run trufflesqueak-polyglot-get on TruffleSqueak JVM standalone
       run: |
-        trufflesqueak-polyglot-get -v 24.1.1 -a js
+        trufflesqueak-polyglot-get -v 24.1.2 -a js
         trufflesqueak --code "Polyglot eval: 'js' string: 'new Object({hello_world: 42})'" images/test-64bit.image
       if: ${{ matrix.type == 'jvm' }}
     - name: Upload TruffleSqueak standalone

diff --git a/mx.trufflesqueak/graalvm-24.1.1.patch → mx.trufflesqueak/graalvm-24.1.2.patch b/mx.trufflesqueak/graalvm-24.1.1.patch → mx.trufflesqueak/graalvm-24.1.2.patch
diff --git a/mx.trufflesqueak/suite.py b/mx.trufflesqueak/suite.py
@@ -47,7 +47,7 @@
             {
                 "name": "truffle",
                 "subdir": True,
-                "version": "vm-24.1.1",
+                "version": "vm-24.1.2",
                 "urls": [{"url": "https://github.com/oracle/graal", "kind": "git"}],
             }
         ],
@@ -109,21 +109,21 @@
             },
         },
         "TRUFFLE-ENTERPRISE": {
-            "digest": "sha512:a9eee386efea7b5866e81e7e19e31ef1fe8ec322f733ca0cc4431522ce1d7c6a73727f588cfef738e0384ec94c4b6241450227d45ea94156dc5286df1b4683d9",
+            "digest": "sha512:ce4cefe6706110cf352271c58d519cfed5bc73d419f1946ff03f0064a80d1a64e633cd4a1f6aa93c3e732b422ff69c132ae73767972526dbf4063cae7cc9df60",
             "maven": {
                 "groupId": "org.graalvm.truffle",
                 "artifactId": "truffle-enterprise",
-                "version": "24.1.1",
+                "version": "24.1.2",
             },
             "useModulePath": True,
             "licence": "GFTC",
         },
         "SDK-NATIVEBRIDGE": {
-            "digest": "sha512:7b53c53afdc6d6394e95629f3a763aa061e1d6654e63f1464176729cd39fe1ca63014d76943c9cdb1047267d23006a140c03c14d51343645599f0c8196656803",
+            "digest": "sha512:1e25b3b58ae01ef929ad71c9c1bb01376258919384810634e23a483836f53e9e77f1c5317c6220fee6bc3e7f5f36359c2ce84e5287c8335208431c675fa0925a",
             "maven": {
                 "groupId": "org.graalvm.sdk",
                 "artifactId": "nativebridge",
-                "version": "24.1.1",
+                "version": "24.1.2",
             },
             "useModulePath": True,
         },

diff --git a/mx.trufflesqueak/utils.sh b/mx.trufflesqueak/utils.sh
@@ -302,7 +302,7 @@ shallow-clone-graalvm-project() {
 shallow-clone-graal() {
   shallow-clone-graalvm-project https://github.com/oracle/graal.git "${GRAAL_VERSION}"
   echo "[graal repo (${GRAAL_VERSION}) cloned successfully]"
-  $(cd ${BASE_DIRECTORY}/../graal && git apply "${SCRIPT_DIRECTORY}/graalvm-24.1.1.patch")
+  $(cd ${BASE_DIRECTORY}/../graal && git apply "${SCRIPT_DIRECTORY}/graalvm-24.1.2.patch")
   echo "[graal repo patched successfully]"
 }
 

diff --git a/...pi.swa.trufflesqueak.shared/src/de/hpi/swa/trufflesqueak/shared/SqueakLanguageConfig.java b/...pi.swa.trufflesqueak.shared/src/de/hpi/swa/trufflesqueak/shared/SqueakLanguageConfig.java
@@ -13,7 +13,7 @@ public final class SqueakLanguageConfig {
     public static final String MIME_TYPE = "application/x-smalltalk";
     public static final String NAME = "Squeak/Smalltalk";
     public static final String ST_MIME_TYPE = "text/x-smalltalk";
-    public static final String VERSION = "24.1.1"; // sync with Truffle import
+    public static final String VERSION = "24.1.2"; // sync with Truffle import
     public static final String WEBSITE = "https://github.com/hpi-swa/trufflesqueak";
 
     public static final String[][] SUPPORTED_IMAGES = {