Build with JDK 21.

hpi-swa · Sep 20, 2023 · 70c8d43 · 70c8d43
1 parent fff829c
commit 70c8d43
Showing 1 changed file with 8 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -41,8 +41,8 @@ jobs:
         tar -xzf ${eclipse_tar_path} -C ${RUNNER_TEMP}
         echo "ECLIPSE_EXE=${RUNNER_TEMP}/eclipse/eclipse" >> "${GITHUB_ENV}" # required by mx
         echo "JDT=builtin" >> "${GITHUB_ENV}" # required by mx
-        # Set up mx, oracle/graal, and LabsJDK17
-        mx.trufflesqueak/utils.sh "set-up-mx && shallow-clone-graal && set-up-labsjdk labsjdk-ce-17 ~/"
+        # Set up mx, oracle/graal, and LabsJDK21
+        mx.trufflesqueak/utils.sh "set-up-mx && shallow-clone-graal && set-up-labsjdk labsjdk-ce-21 ~/"
         # Set up style dependencies
         sudo apt update && sudo apt install python3-pip python-setuptools
         jq -r '.pip | to_entries[] | .key+.value' ../graal/common.json | xargs sudo pip install
@@ -54,10 +54,9 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-20.04, ubuntu-20.04-aarch64, macos-11, windows-2022]
-        java: [17, 20]
+        java: [21]
     env:
-      RUN_TESTS: "${{ matrix.os == 'ubuntu-20.04' || matrix.java == 17 }}"
-      RUN_WITH_COVERAGE: "${{ matrix.os == 'ubuntu-20.04' && matrix.java == 17 }}"
+      RUN_WITH_COVERAGE: "${{ matrix.os == 'ubuntu-20.04' }}"
       MX_ENV: "trufflesqueak-jar"
 
     name: JAR ${{ matrix.os }} + JDK${{ matrix.java }}
@@ -104,19 +103,18 @@ jobs:
     - name: Clone Graal.js repository
       shell: bash
       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 ${{ env.MX_GATE_OPTS }} --tags build,test
-      if: ${{ env.RUN_TESTS == 'true' && runner.os != 'Windows' && env.RUN_WITH_COVERAGE != 'true' }}
+      if: ${{ 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 ${{ env.MX_GATE_OPTS }} --tags build,test --jacocout coverage
-      if: ${{ env.RUN_TESTS == 'true' && runner.os != 'Windows' && env.RUN_WITH_COVERAGE == 'true' }}
+      if: ${{ 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\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
         mx --disable-polyglot --dy /compiler,/graal-js gate ${{ env.MX_GATE_OPTS }} --tags build,test
-      if: ${{ env.RUN_TESTS == 'true' && runner.os == 'Windows' }}
+      if: ${{ runner.os == 'Windows' }}
     - name: Report code coverage
       env:
         CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
@@ -127,23 +125,21 @@ jobs:
     - name: Zip Graal compiler dumps
       shell: bash
       run: "[[ -d graal_dumps ]] && zip -r graal_dumps.zip graal_dumps || true"
-      if: ${{ env.RUN_TESTS == 'true' }}
     - name: Upload Graal compiler dumps
       uses: actions/upload-artifact@v3
       with:
         name: graal_dumps
         path: graal_dumps.zip
         if-no-files-found: ignore
         retention-days: 5
-      if: ${{ env.RUN_TESTS == 'true' }}
 
   build-standalone:
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-20.04, ubuntu-20.04-aarch64, windows-2022] # temporarily disabled: macos-11
     env:
-      JAVA_VERSION: "20"
+      JAVA_VERSION: "21"
       MX_ENV: "trufflesqueak-standalone"
       VERBOSE_GRAALVM_LAUNCHERS: true
     name: Standalone ${{ matrix.os }}