From fb8a75bae48bcce8cf7b0d1de610a571b5cea9f3 Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <code@fniephaus.com>
Date: Fri, 16 Feb 2024 15:55:09 +0100
Subject: [PATCH] Build standalones with JDK 21

This makes it possible to use Oracle GraalVM again.
---
 .github/workflows/ci.yml | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fe6af7377..ba20ecf4f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -140,7 +140,7 @@ jobs:
         os: [ubuntu-20.04, ubuntu-20.04-aarch64, windows-2022, macos-11, macos-14]
         type: [native, jvm]
     env:
-      JAVA_VERSION: "22"
+      JAVA_VERSION: "21"
       MX_ENV: "trufflesqueak-${{ matrix.type }}"
       VERBOSE_GRAALVM_LAUNCHERS: true
     name: ${{ matrix.type }} ${{ matrix.os }}
@@ -149,20 +149,19 @@ jobs:
     steps:
     - name: Clone TruffleSqueak repository
       uses: actions/checkout@v4
-    # Oracle GraalVM for JDK 22 not released yet
-    # - name: Set up Oracle GraalVM
-    #   uses: graalvm/setup-graalvm@v1
-    #   with:
-    #     java-version: ${{ env.JAVA_VERSION }}
-    #     distribution: 'graalvm'
-    #     github-token: ${{ secrets.GITHUB_TOKEN }}
-    #   if: ${{ matrix.type == 'native' }}
-    # - name: Enable Oracle GraalVM
-    #   shell: bash
-    #   run: |
-    #     echo "EXTRA_GRAALVM_HOME=$JAVA_HOME" >> $GITHUB_ENV
-    #     cat "${JAVA_HOME}/LICENSE.txt" > "${GITHUB_WORKSPACE}/LICENSE"
-    #   if: ${{ matrix.type == 'native' }}
+    - name: Set up Oracle GraalVM
+      uses: graalvm/setup-graalvm@v1
+      with:
+        java-version: ${{ env.JAVA_VERSION }}
+        distribution: 'graalvm'
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+      if: ${{ matrix.type == 'native' }}
+    - name: Enable Oracle GraalVM
+      shell: bash
+      run: |
+        echo "EXTRA_GRAALVM_HOME=$JAVA_HOME" >> $GITHUB_ENV
+        cat "${JAVA_HOME}/LICENSE.txt" > "${GITHUB_WORKSPACE}/LICENSE"
+      if: ${{ matrix.type == 'native' }}
     - name: Set up Python
       uses: actions/setup-python@v5
       with: