Skip to content

Commit

Permalink
Upgrade to GraalVM JDK 22 and Truffle 24.0.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
fniephaus committed Mar 20, 2024
1 parent 0f1ac8e commit faf1303
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 22 deletions.
29 changes: 14 additions & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,20 +151,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:
Expand Down Expand Up @@ -197,7 +196,7 @@ jobs:
run: 'trufflesqueak --code "(String streamContents: [:s | SystemReporter basicNew reportImage: s; reportVM: s; reportVMParameters: s]) withUnixLineEndings" images/test-64bit.image'
- name: Run trufflesqueak-polyglot-get on TruffleSqueak JVM standalone
run: |
trufflesqueak-polyglot-get -v 23.1.0 -a js
trufflesqueak-polyglot-get -v 24.0.0 -a js
trufflesqueak --code "Polyglot eval: 'js' string: 'new Object({hello_world: 42})'" images/test-64bit.image
if: ${{ matrix.type == 'jvm' }}
- name: Upload TruffleSqueak standalone
Expand Down
10 changes: 5 additions & 5 deletions mx.trufflesqueak/suite.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"suites": [{
"name": "truffle",
"subdir": True,
"version": "release/graal-vm/24.0",
"version": "vm-24.0.0",
"urls": [{
"url": "https://github.com/oracle/graal",
"kind": "git"
Expand Down Expand Up @@ -120,20 +120,20 @@
},
},
"TRUFFLE-ENTERPRISE": {
"digest": "sha512:b883d3ead84778617f9b09edaa43634183f07cdc6ae0666cb2f4edabc52fca913138c4a7a8f9ada1adbd4a9bbe7d16fb4a1b3ceac13446f4e0c47f3d1a20469f",
"digest": "sha512:718973b01213647ac091376e9fb32d739f09c0f46a20f916505c10899a2f877414018b18e1b42706a49fa9672b0ee289b9b88b2b56ac8d4db727230eeeb75849",
"maven": {
"groupId": "org.graalvm.truffle",
"artifactId": "truffle-enterprise",
"version": "23.1.2",
"version": "24.0.0",
},
"useModulePath": True,
},
"SDK-NATIVEBRIDGE": {
"digest": "sha512:5c2187fa912ab9cc1bb872e08acd3cae5332e2920502b1d7cbe6bc1e70431960e8ed28d153cddd0a3f7d99f618f229d9ac78969d2c94ee1a9a79c003f5c9cc46",
"digest": "sha512:08719b2a6946f8db237fdf35badc7aae6942bc510f883bbc91818f3166f85b0a595656e644e7b1c2ad614f1d0f397a9e06e693ea057695ff1c29ea9b79d1ff75",
"maven": {
"groupId": "org.graalvm.sdk",
"artifactId": "nativebridge",
"version": "23.1.2",
"version": "24.0.0",
},
"useModulePath": True,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public final class SqueakLanguageConfig {
public static final String MIME_TYPE = "application/x-smalltalk";
public static final String NAME = "Squeak/Smalltalk";
public static final String ST_MIME_TYPE = "text/x-smalltalk";
public static final String VERSION = "23.1.0";
public static final String VERSION = "24.0.0";
public static final String WEBSITE = "https://github.com/hpi-swa/trufflesqueak";

public static final String[][] SUPPORTED_IMAGES = {
Expand Down

0 comments on commit faf1303

Please sign in to comment.