From 588922bd16d41c60990b04c34183ae3a9d68a608 Mon Sep 17 00:00:00 2001 From: Fabio Niephaus Date: Fri, 16 Feb 2024 16:17:02 +0100 Subject: [PATCH] Revert "Build standalones with JDK 21" This reverts commit fb8a75bae48bcce8cf7b0d1de610a571b5cea9f3. --- .github/workflows/ci.yml | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 272aa3e8c..cffe2cf56 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -141,7 +141,7 @@ jobs: os: [ubuntu-20.04, ubuntu-20.04-aarch64, windows-2022, macos-11, macos-14] type: [native, jvm] env: - JAVA_VERSION: "21" + JAVA_VERSION: "22" MX_ENV: "trufflesqueak-${{ matrix.type }}" VERBOSE_GRAALVM_LAUNCHERS: true name: ${{ matrix.type }} ${{ matrix.os }} @@ -150,19 +150,20 @@ jobs: steps: - name: Clone TruffleSqueak repository uses: actions/checkout@v4 - - 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' }} + # 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 Python uses: actions/setup-python@v5 with: