diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4ea0b8243..ab7fd2edb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,7 +53,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-20.04, ubuntu-20.04-aarch64, macos-11, windows-2022] - java: [21] + java: [22] env: RUN_WITH_COVERAGE: "${{ matrix.os == 'ubuntu-20.04' }}" MX_ENV: "trufflesqueak-jar" @@ -72,7 +72,7 @@ jobs: python-version: '3.8' - name: Set up dependencies shell: bash - run: mx.trufflesqueak/utils.sh set-up-dependencies java${{ matrix.java }} jar + run: mx.trufflesqueak/utils.sh set-up-dependencies jar - name: Build GraalVM with TruffleSqueak run: mx.trufflesqueak/utils.sh build-graalvm ${{ matrix.java }} if: ${{ runner.os != 'Windows' }} @@ -140,7 +140,7 @@ jobs: os: [ubuntu-20.04, ubuntu-20.04-aarch64, windows-2022, macos-11] type: [native, jvm] env: - JAVA_VERSION: "21" + JAVA_VERSION: "22" MX_ENV: "trufflesqueak-${{ matrix.type }}" VERBOSE_GRAALVM_LAUNCHERS: true name: ${{ matrix.type }} ${{ matrix.os }} @@ -149,26 +149,27 @@ jobs: steps: - name: Clone TruffleSqueak repository uses: actions/checkout@v3 - - 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@v4 with: python-version: '3.8' - name: Set up dependencies shell: bash - run: mx.trufflesqueak/utils.sh set-up-dependencies java${{ env.JAVA_VERSION }} ${{ matrix.type }} + run: mx.trufflesqueak/utils.sh set-up-dependencies ${{ matrix.type }} - name: Build TruffleSqueak standalone run: mx.trufflesqueak/utils.sh build-standalone ${{ matrix.type }} ${{ env.JAVA_VERSION }} if: ${{ runner.os != 'Windows' }} diff --git a/mx.trufflesqueak/mx_trufflesqueak.py b/mx.trufflesqueak/mx_trufflesqueak.py index dce1024b4..0ec388fd4 100644 --- a/mx.trufflesqueak/mx_trufflesqueak.py +++ b/mx.trufflesqueak/mx_trufflesqueak.py @@ -95,7 +95,6 @@ def _unittest_config_participant(config): mx_unittest.add_config_participant(_unittest_config_participant) -mx_truffle.should_add_tck_participant(False) def _add_tck_tests(tasks, supports_coverage): with mx_gate.Task('TruffleSqueak TCK tests', tasks, tags=['test']) as t: diff --git a/mx.trufflesqueak/suite.py b/mx.trufflesqueak/suite.py index 98e218443..7467baa73 100644 --- a/mx.trufflesqueak/suite.py +++ b/mx.trufflesqueak/suite.py @@ -11,7 +11,7 @@ # METADATA # ========================================================================== "name": "trufflesqueak", - "mxversion": "6.41.0", + "mxversion": "7.6.1", "versionConflictResolution": "latest", "version": "23.1.0", @@ -46,7 +46,7 @@ "suites": [{ "name": "truffle", "subdir": True, - "version": "vm-23.1.0", + "version": "release/graal-vm/24.0", "urls": [{ "url": "https://github.com/oracle/graal", "kind": "git" diff --git a/mx.trufflesqueak/utils.sh b/mx.trufflesqueak/utils.sh index 430bc74f5..7f7e73043 100755 --- a/mx.trufflesqueak/utils.sh +++ b/mx.trufflesqueak/utils.sh @@ -226,8 +226,7 @@ set-env() { } set-up-dependencies() { - local java_version=$1 - local kind=$2 + local kind=$1 if [[ "${kind}" == "native" ]]; then case "$(uname -s)" in @@ -244,7 +243,7 @@ set-up-dependencies() { set-up-mx shallow-clone-graal - set-up-labsjdk "labsjdk-ce-${java_version:4}" + set-up-labsjdk download-trufflesqueak-test-image if [[ "${kind}" != "jar" ]]; then set-env "STANDALONE_TARGET" "$(filename-standalone "${kind}")" @@ -252,7 +251,7 @@ set-up-dependencies() { } set-up-labsjdk() { - local jdk_id=$1 + local jdk_id="labsjdk-ce-latest" local target_dir="${RUNNER_TEMP}/jdk" local dl_dir="${RUNNER_TEMP}/jdk-dl" local mx_suffix="" && [[ "${OS_NAME}" == "windows" ]] && mx_suffix=".cmd"