Skip to content

Commit

Permalink
Merge pull request #6369 from mbien/ci-graal-eleven
Browse files Browse the repository at this point in the history
Move GraalVM job to JDK 11.
  • Loading branch information
mbien committed Sep 22, 2023
2 parents 60a9c16 + 0cea1f9 commit e0842b7
Show file tree
Hide file tree
Showing 15 changed files with 297 additions and 296 deletions.
13 changes: 5 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2525,7 +2525,7 @@ jobs:
timeout-minutes: 60
strategy:
matrix:
graal: [ '20.3.0', '21.1.0' ]
graal: [ '22.3.1' ]
fail-fast: false

steps:
Expand All @@ -2544,16 +2544,13 @@ jobs:

- name: Setup GraalVM
run: |
URL=https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${{ matrix.graal }}/graalvm-ce-java8-linux-amd64-${{ matrix.graal }}.tar.gz
URL=https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${{ matrix.graal }}/graalvm-ce-java11-linux-amd64-${{ matrix.graal }}.tar.gz
curl -L $URL | tar -xz
GRAALVM=`pwd`/graalvm-ce-java8-${{ matrix.graal }}
GRAALVM=`pwd`/graalvm-ce-java11-${{ matrix.graal }}
echo "JAVA_HOME=$GRAALVM" >> $GITHUB_ENV
- name: Setup GraalVM Languages
run: |
$JAVA_HOME/bin/gu install python
$JAVA_HOME/bin/gu install R
$JAVA_HOME/bin/gu install ruby
run: $JAVA_HOME/bin/gu install --no-progress python R ruby js

- name: platform/core.network
run: ant $OPTS -f platform/core.network test
Expand All @@ -2574,7 +2571,7 @@ jobs:
run: ant $OPTS -f java/nashorn.execution test

- name: java/debugger.jpda.truffle
run: .github/retry.sh ant $OPTS -f java/debugger.jpda.truffle test
run: ant $OPTS -f java/debugger.jpda.truffle test

- name: Create Test Summary
uses: test-summary/action@v2
Expand Down

This file was deleted.

18 changes: 0 additions & 18 deletions java/debugger.jpda.truffle/external/binaries-list

This file was deleted.

26 changes: 0 additions & 26 deletions java/debugger.jpda.truffle/external/truffle-1.0.0-license.txt

This file was deleted.

3 changes: 1 addition & 2 deletions java/debugger.jpda.truffle/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ javac.source=1.8
javadoc.arch=${basedir}/arch.xml
nbm.module.author=Martin Entlicher
requires.nb.javac=true
truffle.sl=external/antlr4-runtime-4.7.2.jar:external/truffle-sl-1.0.0-rc6.jar
cp.extra=${tools.jar}:${truffle.sl}:${jpda.classes.dir}
cp.extra=${tools.jar}:${jpda.classes.dir}
jpda.classes.dir=${build.dir}/jpda/classes/
test-unit-sys-prop.test.dir.src=${basedir}/test/unit/src/
test-unit-sys-prop.test.dir.classes=${basedir}/build/test/unit/classes
Expand Down
Loading

0 comments on commit e0842b7

Please sign in to comment.