From aff6e0c6c2f4925e73f27d5258f7a5863aea010d Mon Sep 17 00:00:00 2001 From: Fabio Niephaus Date: Mon, 19 Jun 2023 17:18:27 +0200 Subject: [PATCH] Update to new GraalVM for JDK 17 release. --- .github/workflows/espresso-jshell.yml | 12 ++++-------- .github/workflows/fortune-demo.yml | 14 +++----------- .github/workflows/functionGraphDemo.yml | 13 +++---------- .github/workflows/hello-graal.yml | 11 +++-------- .github/workflows/java-hello-world-maven.yml | 8 +++----- .github/workflows/java-kotlin-aot.yml | 11 +++-------- .github/workflows/java-simple-stream-benchmark.yml | 12 +++--------- .github/workflows/javagdbnative.yml | 11 +++-------- .github/workflows/jmh-binary-tree.yml | 10 ++++------ .github/workflows/js-java-async-helidon.yml | 10 +++------- .github/workflows/micronaut-hello-rest-maven.yml | 6 ++---- .github/workflows/multithreading-demo.yml | 11 +++-------- .github/workflows/native-heapdump-examples.yml | 11 +++-------- .github/workflows/native-hello-module.yml | 11 +++-------- .../workflows/native-image-configure-examples.yml | 9 ++++----- .github/workflows/native-image-jmx-demo.yml | 9 +++------ .../workflows/native-image-logging-examples.yml | 11 +++-------- .../workflows/native-image-reflection-example.yml | 11 +++-------- .github/workflows/native-jfr-demo.yml | 10 +++------- .github/workflows/native-list-dir.yml | 12 ++++-------- .github/workflows/native-netty-plot.yml | 9 ++++----- .github/workflows/native-shared-library.yml | 12 ++++-------- .github/workflows/native-static-images.yml | 13 ++++--------- .github/workflows/polyglot-chat-app.yml | 4 ++-- .github/workflows/polyglot-debug.yml | 10 +++------- .github/workflows/polyglot-javascript-java-r.yml | 4 +--- .github/workflows/spring-native-image.yml | 9 ++++----- .github/workflows/streams.yml | 11 ++++++----- .github/workflows/tiny-java-containers.yml | 8 +++----- .../java/com/oracle/example/javapython/Main.java | 1 - spring-native-image/pom.xml | 1 + 31 files changed, 95 insertions(+), 200 deletions(-) diff --git a/.github/workflows/espresso-jshell.yml b/.github/workflows/espresso-jshell.yml index 0c5696cd3..4b57d32b0 100644 --- a/.github/workflows/espresso-jshell.yml +++ b/.github/workflows/espresso-jshell.yml @@ -17,21 +17,17 @@ jobs: run: name: Run 'espresso-jshell' runs-on: ubuntu-latest - timeout-minutes: 15 + timeout-minutes: 20 strategy: matrix: - include: - - version: 'latest' - java-version: '17' - - version: 'dev' - java-version: 'dev' + java-version: ['17', 'dev'] steps: - uses: actions/checkout@v3 - uses: graalvm/setup-graalvm@v1 with: - version: ${{ matrix.version }} java-version: ${{ matrix.java-version }} - components: 'espresso,native-image' + distribution: 'graalvm' + components: 'espresso' github-token: ${{ secrets.GITHUB_TOKEN }} - name: Run 'espresso-jshell' run: | diff --git a/.github/workflows/fortune-demo.yml b/.github/workflows/fortune-demo.yml index 210b1e22d..ab930e413 100644 --- a/.github/workflows/fortune-demo.yml +++ b/.github/workflows/fortune-demo.yml @@ -17,21 +17,13 @@ jobs: run: name: Run 'fortune-demo' runs-on: ubuntu-latest - timeout-minutes: 20 - strategy: - matrix: - include: - - version: 'latest' - java-version: '17' - - version: 'dev' - java-version: '17' + timeout-minutes: 30 steps: - uses: actions/checkout@v3 - uses: graalvm/setup-graalvm@v1 with: - version: ${{ matrix.version }} - java-version: ${{ matrix.java-version }} - components: 'native-image' + java-version: '17.0.7' + distribution: 'graalvm' github-token: ${{ secrets.GITHUB_TOKEN }} - name: Run 'fortune' run: | diff --git a/.github/workflows/functionGraphDemo.yml b/.github/workflows/functionGraphDemo.yml index f1202ca95..3d0dc1f18 100644 --- a/.github/workflows/functionGraphDemo.yml +++ b/.github/workflows/functionGraphDemo.yml @@ -17,20 +17,13 @@ jobs: run: name: Run 'functionGraphDemo' runs-on: ubuntu-latest - timeout-minutes: 10 - strategy: - matrix: - include: - - version: 'latest' - java-version: '17' - - version: 'dev' - java-version: 'dev' + timeout-minutes: 15 steps: - uses: actions/checkout@v3 - uses: graalvm/setup-graalvm@v1 with: - version: ${{ matrix.version }} - java-version: ${{ matrix.java-version }} + version: '22.3.0' + java-version: '17' components: 'nodejs,R,ruby' github-token: ${{ secrets.GITHUB_TOKEN }} - name: Run 'functionGraphDemo' diff --git a/.github/workflows/hello-graal.yml b/.github/workflows/hello-graal.yml index 443bc31a8..9cb127313 100644 --- a/.github/workflows/hello-graal.yml +++ b/.github/workflows/hello-graal.yml @@ -17,21 +17,16 @@ jobs: run: name: Run 'hello-graal' runs-on: ubuntu-latest - timeout-minutes: 10 + timeout-minutes: 15 strategy: matrix: - include: - - version: 'latest' - java-version: '17' - - version: 'dev' - java-version: 'dev' + java-version: ['17', 'dev'] steps: - uses: actions/checkout@v3 - uses: graalvm/setup-graalvm@v1 with: - version: ${{ matrix.version }} java-version: ${{ matrix.java-version }} - components: 'native-image' + distribution: 'graalvm' github-token: ${{ secrets.GITHUB_TOKEN }} native-image-job-reports: 'true' - name: Run 'hello-graal' diff --git a/.github/workflows/java-hello-world-maven.yml b/.github/workflows/java-hello-world-maven.yml index 49d5fccc5..06540c335 100644 --- a/.github/workflows/java-hello-world-maven.yml +++ b/.github/workflows/java-hello-world-maven.yml @@ -14,15 +14,13 @@ jobs: run: name: Run 'java-hello-world-maven' runs-on: ubuntu-latest - timeout-minutes: 10 + timeout-minutes: 15 steps: - uses: actions/checkout@v3 - uses: graalvm/setup-graalvm@v1 with: - version: 'latest' # EE dev builds not supported - gds-token: ${{ secrets.GDS_TOKEN }} - java-version: '17' - components: 'native-image' + java-version: '17.0.7' + distribution: 'graalvm' github-token: ${{ secrets.GITHUB_TOKEN }} cache: 'maven' native-image-job-reports: 'true' diff --git a/.github/workflows/java-kotlin-aot.yml b/.github/workflows/java-kotlin-aot.yml index f66a35c6e..17e445b71 100644 --- a/.github/workflows/java-kotlin-aot.yml +++ b/.github/workflows/java-kotlin-aot.yml @@ -17,21 +17,16 @@ jobs: run: name: Run 'java-kotlin-aot' runs-on: ubuntu-latest - timeout-minutes: 10 + timeout-minutes: 15 strategy: matrix: - include: - - version: 'latest' - java-version: '17' - - version: 'dev' - java-version: '17' + java-version: ['17', 'dev'] steps: - uses: actions/checkout@v3 - uses: graalvm/setup-graalvm@v1 with: - version: ${{ matrix.version }} java-version: ${{ matrix.java-version }} - components: 'native-image' + distribution: 'graalvm' github-token: ${{ secrets.GITHUB_TOKEN }} native-image-job-reports: 'true' - name: Run 'java-kotlin-aot' diff --git a/.github/workflows/java-simple-stream-benchmark.yml b/.github/workflows/java-simple-stream-benchmark.yml index 8d8d2b3c7..058d940f0 100644 --- a/.github/workflows/java-simple-stream-benchmark.yml +++ b/.github/workflows/java-simple-stream-benchmark.yml @@ -17,23 +17,17 @@ jobs: run: name: Run 'java-simple-stream-benchmark' runs-on: ubuntu-latest - timeout-minutes: 10 + timeout-minutes: 15 strategy: matrix: - include: - - version: 'latest' - java-version: '17' - - version: 'dev' - java-version: 'dev' + java-version: ['17', 'dev'] steps: - uses: actions/checkout@v3 - uses: graalvm/setup-graalvm@v1 with: - version: ${{ matrix.version }} java-version: ${{ matrix.java-version }} - components: 'native-image' + distribution: 'graalvm' github-token: ${{ secrets.GITHUB_TOKEN }} - native-image-job-reports: 'true' - name: Run 'java-simple-stream-benchmark' run: | cd java-simple-stream-benchmark diff --git a/.github/workflows/javagdbnative.yml b/.github/workflows/javagdbnative.yml index 77066251a..2f32e1e50 100644 --- a/.github/workflows/javagdbnative.yml +++ b/.github/workflows/javagdbnative.yml @@ -17,21 +17,16 @@ jobs: run: name: Run 'javagdbnative' runs-on: ubuntu-latest - timeout-minutes: 10 + timeout-minutes: 15 strategy: matrix: - include: - - version: 'latest' - java-version: '17' - - version: 'dev' - java-version: 'dev' + java-version: ['17', 'dev'] steps: - uses: actions/checkout@v3 - uses: graalvm/setup-graalvm@v1 with: - version: ${{ matrix.version }} java-version: ${{ matrix.java-version }} - components: 'native-image' + distribution: 'graalvm' github-token: ${{ secrets.GITHUB_TOKEN }} cache: 'maven' native-image-job-reports: 'true' diff --git a/.github/workflows/jmh-binary-tree.yml b/.github/workflows/jmh-binary-tree.yml index bb87512f7..fc41f6ec4 100644 --- a/.github/workflows/jmh-binary-tree.yml +++ b/.github/workflows/jmh-binary-tree.yml @@ -15,18 +15,16 @@ permissions: contents: read jobs: build: - name: GraalVM Binary Tree Benchmark on ${{ matrix.os }} + name: GraalVM Binary Tree Benchmark runs-on: ubuntu-latest timeout-minutes: 45 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: graalvm/setup-graalvm@v1 with: - version: 'latest' # EE dev builds not supported - gds-token: ${{ secrets.GDS_TOKEN }} - java-version: '17' - components: 'native-image' + java-version: '17.0.7' + distribution: 'graalvm' github-token: ${{ secrets.GITHUB_TOKEN }} - name: Build and Test Java Code diff --git a/.github/workflows/js-java-async-helidon.yml b/.github/workflows/js-java-async-helidon.yml index 401692908..705a94324 100644 --- a/.github/workflows/js-java-async-helidon.yml +++ b/.github/workflows/js-java-async-helidon.yml @@ -17,20 +17,16 @@ jobs: run: name: Run 'js-java-async-helidon' runs-on: ubuntu-latest - timeout-minutes: 10 + timeout-minutes: 15 strategy: matrix: - include: - - version: 'latest' - java-version: '17' - - version: 'dev' - java-version: 'dev' + java-version: ['17', 'dev'] steps: - uses: actions/checkout@v3 - uses: graalvm/setup-graalvm@v1 with: - version: ${{ matrix.version }} java-version: ${{ matrix.java-version }} + distribution: 'graalvm' github-token: ${{ secrets.GITHUB_TOKEN }} cache: 'maven' - name: Run 'js-java-async-helidon' diff --git a/.github/workflows/micronaut-hello-rest-maven.yml b/.github/workflows/micronaut-hello-rest-maven.yml index 3bf26c894..3e57c561e 100644 --- a/.github/workflows/micronaut-hello-rest-maven.yml +++ b/.github/workflows/micronaut-hello-rest-maven.yml @@ -14,15 +14,13 @@ jobs: run: name: Run 'micronaut-hello-rest-maven' runs-on: ubuntu-latest - timeout-minutes: 10 + timeout-minutes: 15 steps: - uses: actions/checkout@v3 - uses: graalvm/setup-graalvm@v1 with: - version: 'latest' # EE dev builds not supported - gds-token: ${{ secrets.GDS_TOKEN }} java-version: '17' - components: 'native-image' + distribution: 'graalvm' github-token: ${{ secrets.GITHUB_TOKEN }} cache: 'maven' native-image-job-reports: 'true' diff --git a/.github/workflows/multithreading-demo.yml b/.github/workflows/multithreading-demo.yml index d942ef719..44e643a07 100644 --- a/.github/workflows/multithreading-demo.yml +++ b/.github/workflows/multithreading-demo.yml @@ -17,21 +17,16 @@ jobs: run: name: Run 'multithreading-demo' runs-on: ubuntu-latest - timeout-minutes: 10 + timeout-minutes: 15 strategy: matrix: - include: - - version: 'latest' - java-version: '17' - - version: 'dev' - java-version: 'dev' + java-version: ['17', 'dev'] steps: - uses: actions/checkout@v3 - uses: graalvm/setup-graalvm@v1 with: - version: ${{ matrix.version }} java-version: ${{ matrix.java-version }} - components: 'native-image' + distribution: 'graalvm' github-token: ${{ secrets.GITHUB_TOKEN }} cache: 'maven' - name: Run 'multithreading-demo-oversized' diff --git a/.github/workflows/native-heapdump-examples.yml b/.github/workflows/native-heapdump-examples.yml index c7f2729fa..46ab773dc 100644 --- a/.github/workflows/native-heapdump-examples.yml +++ b/.github/workflows/native-heapdump-examples.yml @@ -17,21 +17,16 @@ jobs: run: name: Run 'native-heapdump-examples' runs-on: ubuntu-latest - timeout-minutes: 10 + timeout-minutes: 15 strategy: matrix: - include: - - version: 'latest' - java-version: '17' - - version: 'dev' - java-version: 'dev' + java-version: ['17', 'dev'] steps: - uses: actions/checkout@v3 - uses: graalvm/setup-graalvm@v1 with: - version: ${{ matrix.version }} java-version: ${{ matrix.java-version }} - components: 'native-image' + distribution: 'graalvm' github-token: ${{ secrets.GITHUB_TOKEN }} native-image-job-reports: 'true' - name: Run 'native-heapdump-examples' diff --git a/.github/workflows/native-hello-module.yml b/.github/workflows/native-hello-module.yml index 6d5a2af4a..d9296c868 100644 --- a/.github/workflows/native-hello-module.yml +++ b/.github/workflows/native-hello-module.yml @@ -17,21 +17,16 @@ jobs: run: name: Run 'native-hello-module' runs-on: ubuntu-latest - timeout-minutes: 10 + timeout-minutes: 15 strategy: matrix: - include: - - version: 'latest' - java-version: '17' - - version: 'dev' - java-version: 'dev' + java-version: ['17', 'dev'] steps: - uses: actions/checkout@v3 - uses: graalvm/setup-graalvm@v1 with: - version: ${{ matrix.version }} java-version: ${{ matrix.java-version }} - components: 'native-image' + distribution: 'graalvm' github-token: ${{ secrets.GITHUB_TOKEN }} cache: 'maven' native-image-job-reports: 'true' diff --git a/.github/workflows/native-image-configure-examples.yml b/.github/workflows/native-image-configure-examples.yml index 7b6ec1b96..fe4c1229e 100644 --- a/.github/workflows/native-image-configure-examples.yml +++ b/.github/workflows/native-image-configure-examples.yml @@ -17,17 +17,16 @@ jobs: run: name: Run 'native-image-configure-examples' runs-on: ubuntu-latest - timeout-minutes: 10 + timeout-minutes: 15 strategy: matrix: - version: [latest, dev] + java-version: ['17', 'dev'] steps: - uses: actions/checkout@v3 - uses: graalvm/setup-graalvm@v1 with: - version: ${{ matrix.version }} - java-version: '17' - components: 'native-image' + java-version: ${{ matrix.java-version }} + distribution: 'graalvm' github-token: ${{ secrets.GITHUB_TOKEN }} cache: 'maven' - name: Run 'configure-at-runtime-example' diff --git a/.github/workflows/native-image-jmx-demo.yml b/.github/workflows/native-image-jmx-demo.yml index ad8a7ea74..0d57c9176 100644 --- a/.github/workflows/native-image-jmx-demo.yml +++ b/.github/workflows/native-image-jmx-demo.yml @@ -17,19 +17,16 @@ jobs: run: name: Run 'native-image-jmx-demo' runs-on: ubuntu-latest - timeout-minutes: 10 + timeout-minutes: 15 strategy: matrix: - include: - - version: 'dev' - java-version: '17' + java-version: ['17', 'dev'] steps: - uses: actions/checkout@v3 - uses: graalvm/setup-graalvm@v1 with: - version: ${{ matrix.version }} java-version: ${{ matrix.java-version }} - components: 'native-image' + distribution: 'graalvm' github-token: ${{ secrets.GITHUB_TOKEN }} native-image-job-reports: 'true' - name: Run 'native-image-jmx-demo' diff --git a/.github/workflows/native-image-logging-examples.yml b/.github/workflows/native-image-logging-examples.yml index 874c0d23c..05e87efda 100644 --- a/.github/workflows/native-image-logging-examples.yml +++ b/.github/workflows/native-image-logging-examples.yml @@ -17,21 +17,16 @@ jobs: run: name: Run 'native-image-logging-examples' runs-on: ubuntu-latest - timeout-minutes: 10 + timeout-minutes: 15 strategy: matrix: - include: - - version: 'latest' - java-version: '17' - - version: 'dev' - java-version: 'dev' + java-version: ['17', 'dev'] steps: - uses: actions/checkout@v3 - uses: graalvm/setup-graalvm@v1 with: - version: ${{ matrix.version }} java-version: ${{ matrix.java-version }} - components: 'native-image' + distribution: 'graalvm' github-token: ${{ secrets.GITHUB_TOKEN }} native-image-job-reports: 'true' - name: Run 'native-image-logging-examples' diff --git a/.github/workflows/native-image-reflection-example.yml b/.github/workflows/native-image-reflection-example.yml index 28ff9260e..c5f401d6c 100644 --- a/.github/workflows/native-image-reflection-example.yml +++ b/.github/workflows/native-image-reflection-example.yml @@ -17,21 +17,16 @@ jobs: run: name: Run 'native-image-reflection-example' runs-on: ubuntu-latest - timeout-minutes: 10 + timeout-minutes: 15 strategy: matrix: - include: - - version: 'latest' - java-version: '17' - - version: 'dev' - java-version: 'dev' + java-version: ['17', 'dev'] steps: - uses: actions/checkout@v3 - uses: graalvm/setup-graalvm@v1 with: - version: ${{ matrix.version }} java-version: ${{ matrix.java-version }} - components: 'native-image' + distribution: 'graalvm' github-token: ${{ secrets.GITHUB_TOKEN }} native-image-job-reports: 'true' - name: Run 'native-image-reflection-example' diff --git a/.github/workflows/native-jfr-demo.yml b/.github/workflows/native-jfr-demo.yml index 89cdd62d6..2c5b38779 100644 --- a/.github/workflows/native-jfr-demo.yml +++ b/.github/workflows/native-jfr-demo.yml @@ -17,20 +17,16 @@ jobs: run: name: Run 'native-jfr-demo' runs-on: ubuntu-latest - timeout-minutes: 10 + timeout-minutes: 15 strategy: matrix: - include: - - version: 'latest' - java-version: '17' - - version: 'dev' - java-version: 'dev' + java-version: ['17', 'dev'] steps: - uses: actions/checkout@v3 - uses: graalvm/setup-graalvm@v1 with: - version: ${{ matrix.version }} java-version: ${{ matrix.java-version }} + distribution: 'graalvm' components: 'native-image,visualvm' github-token: ${{ secrets.GITHUB_TOKEN }} native-image-job-reports: 'true' diff --git a/.github/workflows/native-list-dir.yml b/.github/workflows/native-list-dir.yml index bfdca5ccb..152502072 100644 --- a/.github/workflows/native-list-dir.yml +++ b/.github/workflows/native-list-dir.yml @@ -17,21 +17,17 @@ jobs: run: name: Run 'native-list-dir' runs-on: ubuntu-latest - timeout-minutes: 15 + timeout-minutes: 20 strategy: matrix: - include: - - version: 'latest' - java-version: '17' - - version: 'dev' - java-version: 'dev' + java-version: ['17', 'dev'] steps: - uses: actions/checkout@v3 - uses: graalvm/setup-graalvm@v1 with: - version: ${{ matrix.version }} java-version: ${{ matrix.java-version }} - components: 'native-image,js' + distribution: 'graalvm' + components: 'js' github-token: ${{ secrets.GITHUB_TOKEN }} native-image-job-reports: 'true' - name: Run 'native-list-dir' diff --git a/.github/workflows/native-netty-plot.yml b/.github/workflows/native-netty-plot.yml index fa412fae9..3537510c9 100644 --- a/.github/workflows/native-netty-plot.yml +++ b/.github/workflows/native-netty-plot.yml @@ -17,17 +17,16 @@ jobs: run: name: Run 'native-netty-plot' runs-on: ubuntu-latest - timeout-minutes: 15 + timeout-minutes: 20 strategy: matrix: - version: [latest, dev] + java-version: ['17', 'dev'] steps: - uses: actions/checkout@v3 - uses: graalvm/setup-graalvm@v1 with: - version: ${{ matrix.version }} - java-version: '17' - components: 'native-image' + java-version: ${{ matrix.java-version }} + distribution: 'graalvm' github-token: ${{ secrets.GITHUB_TOKEN }} cache: 'maven' native-image-job-reports: 'true' diff --git a/.github/workflows/native-shared-library.yml b/.github/workflows/native-shared-library.yml index a0320dd56..840ab0fe2 100644 --- a/.github/workflows/native-shared-library.yml +++ b/.github/workflows/native-shared-library.yml @@ -17,21 +17,17 @@ jobs: run: name: Run 'native-shared-library' runs-on: ubuntu-latest - timeout-minutes: 10 + timeout-minutes: 15 strategy: matrix: - include: - - version: 'latest' - java-version: '17' - - version: 'dev' - java-version: 'dev' + java-version: ['17', 'dev'] steps: - uses: actions/checkout@v3 - uses: graalvm/setup-graalvm@v1 with: - version: ${{ matrix.version }} java-version: ${{ matrix.java-version }} - components: 'native-image,llvm-toolchain' + distribution: 'graalvm' + components: 'llvm-toolchain' github-token: ${{ secrets.GITHUB_TOKEN }} native-image-job-reports: 'true' - name: Run 'native-shared-library' diff --git a/.github/workflows/native-static-images.yml b/.github/workflows/native-static-images.yml index aaa5662bb..9b09d4387 100644 --- a/.github/workflows/native-static-images.yml +++ b/.github/workflows/native-static-images.yml @@ -17,7 +17,7 @@ jobs: run-static: name: Run static 'native-static-images' runs-on: ubuntu-latest - timeout-minutes: 10 + timeout-minutes: 15 strategy: matrix: include: @@ -43,21 +43,16 @@ jobs: run-mostly-static: name: Run mostly-static 'native-static-images' runs-on: ubuntu-latest - timeout-minutes: 10 + timeout-minutes: 15 strategy: matrix: - include: - - version: 'latest' - java-version: '17' - - version: 'dev' - java-version: 'dev' + java-version: ['17', 'dev'] steps: - uses: actions/checkout@v3 - uses: graalvm/setup-graalvm@v1 with: - version: ${{ matrix.version }} java-version: ${{ matrix.java-version }} - components: 'native-image' + distribution: 'graalvm' github-token: ${{ secrets.GITHUB_TOKEN }} native-image-job-reports: 'true' - name: Run mostly-static 'mostly-static-image' diff --git a/.github/workflows/polyglot-chat-app.yml b/.github/workflows/polyglot-chat-app.yml index a7a2c1583..9d23624b5 100644 --- a/.github/workflows/polyglot-chat-app.yml +++ b/.github/workflows/polyglot-chat-app.yml @@ -17,10 +17,10 @@ jobs: run: name: Run 'polyglot-chat-app' runs-on: ubuntu-latest - timeout-minutes: 10 + timeout-minutes: 15 strategy: matrix: - version: [latest, dev] + version: [22.3.0] # temporarily locked to 22.3.0 due to R steps: - uses: actions/checkout@v3 - uses: graalvm/setup-graalvm@v1 diff --git a/.github/workflows/polyglot-debug.yml b/.github/workflows/polyglot-debug.yml index 8c3451e01..c51fdd870 100644 --- a/.github/workflows/polyglot-debug.yml +++ b/.github/workflows/polyglot-debug.yml @@ -17,20 +17,16 @@ jobs: run: name: Run 'polyglot-debug' runs-on: ubuntu-latest - timeout-minutes: 10 + timeout-minutes: 15 strategy: matrix: - include: - - version: 'latest' - java-version: '17' - - version: 'dev' - java-version: 'dev' + java-version: ['17', 'dev'] steps: - uses: actions/checkout@v3 - uses: graalvm/setup-graalvm@v1 with: - version: ${{ matrix.version }} java-version: ${{ matrix.java-version }} + distribution: 'graalvm' components: 'js' github-token: ${{ secrets.GITHUB_TOKEN }} cache: 'maven' diff --git a/.github/workflows/polyglot-javascript-java-r.yml b/.github/workflows/polyglot-javascript-java-r.yml index 761cabdf6..eaabc6095 100644 --- a/.github/workflows/polyglot-javascript-java-r.yml +++ b/.github/workflows/polyglot-javascript-java-r.yml @@ -21,10 +21,8 @@ jobs: strategy: matrix: include: - - version: 'latest' + - version: '22.3.0' # temporarily locked to 22.3.0 due to R java-version: '17' - - version: 'dev' - java-version: 'dev' steps: - uses: actions/checkout@v3 - uses: graalvm/setup-graalvm@v1 diff --git a/.github/workflows/spring-native-image.yml b/.github/workflows/spring-native-image.yml index 167683add..c5cfb4e63 100644 --- a/.github/workflows/spring-native-image.yml +++ b/.github/workflows/spring-native-image.yml @@ -17,17 +17,16 @@ jobs: run: name: Run 'spring-native-graal' runs-on: ubuntu-latest - timeout-minutes: 10 + timeout-minutes: 20 strategy: matrix: - version: [22.3.0] # temporarily locked to 22.3.0 for Spring Boot 3 compatibility + java-version: ['17', 'dev'] steps: - uses: actions/checkout@v3 - uses: graalvm/setup-graalvm@v1 with: - version: ${{ matrix.version }} - java-version: '17' - components: 'native-image' + java-version: ${{ matrix.java-version }} + distribution: 'graalvm' github-token: ${{ secrets.GITHUB_TOKEN }} cache: 'maven' native-image-job-reports: 'true' diff --git a/.github/workflows/streams.yml b/.github/workflows/streams.yml index d39d8b528..5d7c268f2 100644 --- a/.github/workflows/streams.yml +++ b/.github/workflows/streams.yml @@ -14,15 +14,16 @@ jobs: run: name: Run 'streams' runs-on: ubuntu-latest - timeout-minutes: 10 + timeout-minutes: 15 + strategy: + matrix: + java-version: ['17', '20'] steps: - uses: actions/checkout@v3 - uses: graalvm/setup-graalvm@v1 with: - version: 'latest' # EE dev builds not supported - gds-token: ${{ secrets.GDS_TOKEN }} - java-version: '11' - components: 'native-image' + java-version: ${{ matrix.java-version }} + distribution: 'graalvm' github-token: ${{ secrets.GITHUB_TOKEN }} native-image-job-reports: 'true' - name: Run 'streams' diff --git a/.github/workflows/tiny-java-containers.yml b/.github/workflows/tiny-java-containers.yml index e31e772ea..d032b9fef 100644 --- a/.github/workflows/tiny-java-containers.yml +++ b/.github/workflows/tiny-java-containers.yml @@ -13,15 +13,13 @@ jobs: run: name: Run 'tiny-java-containers' runs-on: ubuntu-20.04 # Docker has changed its behavior on Ubuntu 22.04 - timeout-minutes: 15 + timeout-minutes: 20 steps: - uses: actions/checkout@v3 - uses: graalvm/setup-graalvm@v1 with: - version: 'latest' # EE dev builds not supported - gds-token: ${{ secrets.GDS_TOKEN }} - java-version: '19' - components: 'native-image' + java-version: '20.0.1' + distribution: 'graalvm' github-token: ${{ secrets.GITHUB_TOKEN }} - name: Run 'tiny-java-containers' run: | diff --git a/graalpy-notebook-example/src/main/java/com/oracle/example/javapython/Main.java b/graalpy-notebook-example/src/main/java/com/oracle/example/javapython/Main.java index bcbecf801..8f67f46e4 100644 --- a/graalpy-notebook-example/src/main/java/com/oracle/example/javapython/Main.java +++ b/graalpy-notebook-example/src/main/java/com/oracle/example/javapython/Main.java @@ -39,7 +39,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - */ import java.awt.Button; import java.awt.Canvas; import java.awt.Component; diff --git a/spring-native-image/pom.xml b/spring-native-image/pom.xml index d92debe93..3933ec7c9 100644 --- a/spring-native-image/pom.xml +++ b/spring-native-image/pom.xml @@ -52,6 +52,7 @@ org.graalvm.buildtools native-maven-plugin + 0.9.21 org.springframework.boot