From ce501565a054a229f9d0a40916b3df7cb575388a Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <code@fniephaus.com>
Date: Tue, 21 Mar 2023 15:14:27 +0100
Subject: [PATCH] Upgrade to release branch for GraalVM `23.0`

---
 .github/workflows/ci.yml  | 28 +++++++++++++++-------------
 mx.trufflesqueak/suite.py |  4 ++--
 mx.trufflesqueak/utils.sh |  5 ++++-
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bfbdfd909..8062d7e3a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,6 +16,10 @@ on:
       - 'docs/**'
       - gu-catalog.properties
 
+env:
+  VERBOSE_GRAALVM_LAUNCHERS: true
+  MX_GATE_OPTS: '--strict-mode --omit-clean --no-warning-as-error'
+
 jobs:
   style_and_build_config:
     name: Code Style + Build Config
@@ -40,23 +44,21 @@ jobs:
         mx.trufflesqueak/utils.sh "set-up-mx && shallow-clone-graal && set-up-labsjdk labsjdk-ce-17 ~/"
         # Set up style dependencies
         sudo apt update && sudo apt install python3-pip python-setuptools
-        cat ../graal/common.json |
-          jq -r '.deps.common.packages | to_entries[] | select(.key | startswith("pip:")) | (.key | split(":")[1]) + .value' |
-          xargs sudo pip install
+        jq -r '.pip | to_entries[] | .key+.value' ../graal/common.json | xargs sudo pip install
     - name: Check style and perform full build
-      run: mx gate --strict-mode --tags style,fullbuild
+      run: mx gate ${{ env.MX_GATE_OPTS }} --tags style,fullbuild
 
   build-jar:
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-20.04, ubuntu-20.04-aarch64, macos-11, windows-2019]
-        java: [17, 19]
+        java: [17, 20]
     env:
       RUN_TESTS: "${{ matrix.os == 'ubuntu-20.04' || matrix.java == 17 }}"
       RUN_WITH_COVERAGE: "${{ matrix.os == 'ubuntu-20.04' && matrix.java == 17 }}"
       MX_ENV: "trufflesqueak-jar"
-      VERBOSE_GRAALVM_LAUNCHERS: true
+      
     name: JAR ${{ matrix.os }} + JDK${{ matrix.java }}
     timeout-minutes: 60
     runs-on: ${{ matrix.os }}
@@ -79,7 +81,7 @@ jobs:
       shell: cmd
       run: |
         call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
-        call mx --env ${{ env.MX_ENV }} --no-download-progress build --dependencies SMALLTALK_INSTALLABLE_JAVA${{ matrix.java }},GRAALVM_TRUFFLESQUEAK_JAR_JAVA${{ matrix.java }}
+        call mx --env ${{ env.MX_ENV }} --no-download-progress build --dependencies SMALLTALK_INSTALLABLE_CE_JAVA${{ matrix.java }},GRAALVM_TRUFFLESQUEAK_JAR_JAVA${{ matrix.java }}
         call mx --env ${{ env.MX_ENV }} graalvm-home > graalvm-home-with-forward-slashes.txt
         set /p GRAALVM_HOME=<graalvm-home-with-forward-slashes.txt
         setlocal enabledelayedexpansion
@@ -87,7 +89,7 @@ jobs:
         echo %GRAALVM_HOME%\bin>>%GITHUB_PATH%
         echo GRAALVM_HOME=%GRAALVM_HOME%>>%GITHUB_ENV%
         echo [%GRAALVM_HOME% set as $GRAALVM_HOME]
-        call mx --env ${{ env.MX_ENV }} paths SMALLTALK_INSTALLABLE_JAVA${{ matrix.java }} > installable-path-with-forward-slashes.txt
+        call mx --env ${{ env.MX_ENV }} paths SMALLTALK_INSTALLABLE_CE_JAVA${{ matrix.java }} > installable-path-with-forward-slashes.txt
         set /p INSTALLABLE_PATH=<installable-path-with-forward-slashes.txt
         setlocal enabledelayedexpansion
         set "INSTALLABLE_PATH=%INSTALLABLE_PATH:/=\%"
@@ -103,16 +105,16 @@ jobs:
       run: mx.trufflesqueak/utils.sh shallow-clone-graaljs
       if: ${{ env.RUN_TESTS == 'true' }}
     - name: Run gate with Graal compiler and Graal.js
-      run: mx --disable-polyglot --dy /compiler,/graal-js gate -j -n --strict-mode --tags build,test
+      run: mx --disable-polyglot --dy /compiler,/graal-js gate ${{ env.MX_GATE_OPTS }} --tags build,test
       if: ${{ env.RUN_TESTS == 'true' && runner.os != 'Windows' && env.RUN_WITH_COVERAGE != 'true' }}
     - name: Run gate with Graal.js and code coverage # do not use Graal compiler with JaCoCo code coverage
-      run: mx --disable-polyglot --dy /graal-js gate -j -n --strict-mode --tags build,test --jacocout coverage
+      run: mx --disable-polyglot --dy /graal-js gate ${{ env.MX_GATE_OPTS }} --tags build,test --jacocout coverage
       if: ${{ env.RUN_TESTS == 'true' && runner.os != 'Windows' && env.RUN_WITH_COVERAGE == 'true' }}
     - name: Run gate with Graal compiler and Graal.js via cmd.exe
       shell: cmd
       run: |
         call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
-        mx --disable-polyglot --dy /compiler,/graal-js gate -j -n --strict-mode --tags build,test
+        mx --disable-polyglot --dy /compiler,/graal-js gate ${{ env.MX_GATE_OPTS }} --tags build,test
       if: ${{ env.RUN_TESTS == 'true' && runner.os == 'Windows' }}
     - name: Report code coverage
       env:
@@ -138,9 +140,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2019] # temporarily disabled: [ubuntu-20.04, ubuntu-20.04-aarch64, macos-11, windows-2019]
+        os: [ubuntu-20.04, ubuntu-20.04-aarch64, windows-2019] # temporarily disabled: macos-11
     env:
-      JAVA_VERSION: "17"
+      JAVA_VERSION: "20"
       MX_ENV: "trufflesqueak-standalone"
       VERBOSE_GRAALVM_LAUNCHERS: true
     name: Standalone ${{ matrix.os }}
diff --git a/mx.trufflesqueak/suite.py b/mx.trufflesqueak/suite.py
index 26a691093..e41963e2f 100644
--- a/mx.trufflesqueak/suite.py
+++ b/mx.trufflesqueak/suite.py
@@ -11,7 +11,7 @@
     #  METADATA
     # ==========================================================================
     "name": "trufflesqueak",
-    "mxversion": "6.9.2",
+    "mxversion": "6.17.0",
     "versionConflictResolution": "latest",
 
     "version": "23.0.0",
@@ -48,7 +48,7 @@
         "suites": [{
             "name": "truffle",
             "subdir": True,
-            "version": "vm-22.3.0",
+            "version": "release/graal-vm/23.0",
             "urls": [{
                 "url": "https://github.com/oracle/graal",
                 "kind": "git"
diff --git a/mx.trufflesqueak/utils.sh b/mx.trufflesqueak/utils.sh
index 625d6cc56..42068c63d 100755
--- a/mx.trufflesqueak/utils.sh
+++ b/mx.trufflesqueak/utils.sh
@@ -45,7 +45,7 @@ build-installable() {
   local java_version=$1
   local graalvm_home="$(mx --env trufflesqueak-jar graalvm-home)"
   local distro_name="GRAALVM_TRUFFLESQUEAK_JAR_JAVA${java_version}"
-  local component_name="SMALLTALK_INSTALLABLE_JAVA${java_version}"
+  local component_name="SMALLTALK_INSTALLABLE_CE_JAVA${java_version}"
 
   mx --env trufflesqueak-jar --no-download-progress build --dependencies "${component_name},${distro_name}"
   cp $(mx --env trufflesqueak-jar paths "${component_name}") "${INSTALLABLE_TARGET}"
@@ -259,7 +259,10 @@ set-up-labsjdk() {
   local dl_dir="${RUNNER_TEMP}/jdk-dl"
   local mx_suffix="" && [[ "${OS_NAME}" == "windows" ]] && mx_suffix=".cmd"
   mkdir "${dl_dir}"
+  pushd "${BASE_DIRECTORY}/../graal/" > /dev/null
+  # run fetch-jdk in graal repo, so that it picks up the latest common.json
   "${RUNNER_TEMP}/mx/mx${mx_suffix}" --quiet --java-home= fetch-jdk --jdk-id "${jdk_id}" --to "${dl_dir}" --alias "${target_dir}"
+  popd > /dev/null
   enable-jdk "${target_dir}${JAVA_HOME_SUFFIX}"
   echo "[${jdk_id} set up successfully]"
 }