From 9d84cabc77bd3544d39218273744ae9c5227ae46 Mon Sep 17 00:00:00 2001
From: JohT <johnnyt@gmx.at>
Date: Sun, 2 Jul 2023 08:45:25 +0200
Subject: [PATCH] Switch to Oracle GraalVM JDK 17

---
 .github/workflows/native-image.yml | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/native-image.yml b/.github/workflows/native-image.yml
index e7a22d21..497c9205 100644
--- a/.github/workflows/native-image.yml
+++ b/.github/workflows/native-image.yml
@@ -1,4 +1,4 @@
-name: GraalVM Community Edition Continuous Integration
+name: GraalVM Continuous Integration
 
 on:
   push:
@@ -32,11 +32,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: ['java17']
+        java: ['17']
     env: 
       CI_COMMIT_MESSAGE: Automated native image agent results (CI)
       CI_COMMIT_AUTHOR: ${{ github.event.repository.name }} Continuous Integration
-      GRAALVM_VERSION: 22.3.2
     steps:
       - name: Checkout git repository
         uses: actions/checkout@v3
@@ -53,12 +52,10 @@ jobs:
 
       # Download and prepare GraalVM Community Edition including native image tools
       - name: Setup GraalVM Community Edition
-        uses: DeLaGuardo/setup-graalvm@5.0
+        uses: graalvm/setup-graalvm@v1
         with:
-          graalvm: ${{ env.GRAALVM_VERSION }}
-          java: ${{ matrix.java }}
-      - name: Install Native Image
-        run: gu install native-image
+          java-version: ${{ matrix.java }}
+          distribution: 'graalvm'
 
       # Build the native image of the application.
       - name: Build native image with Maven
@@ -80,10 +77,8 @@ jobs:
       - name: Get the quarkus version from the maven pom variable and set the environment variable "quarkus-version"
         working-directory: showcase-quarkus-eventsourcing
         run: echo "quarkus-version=$(mvn -q help:evaluate -Dexpression=quarkus.platform.version -DforceStdout | tr . -)" >> $GITHUB_ENV
-      - name: Get the GraalVM version with "-" instead of "." delimiters
-        run: echo "graalvm-version-string=$(echo ${{ env.GRAALVM_VERSION }} | tr . -)" >> $GITHUB_ENV
       - name: Assemble the name of the directory for the native image agent output files and set the environment variable "native-image-agent-results-directory"
-        run: echo "native-image-agent-results-directory=native-image-agent-results/${{ matrix.java }}-axon-${{ env.axon-version }}-quarkus-${{ env.quarkus-version }}-graalvm-${{ env.graalvm-version-string }}" >> $GITHUB_ENV
+        run: echo "native-image-agent-results-directory=native-image-agent-results/java-${{ matrix.java }}-axon-${{ env.axon-version }}-quarkus-${{ env.quarkus-version }}-graalvm-oracle" >> $GITHUB_ENV
       
       # Create the directory with the previously assembled name within "native-image-agent-results" and fill in the result files.
       - name: Create the native image agent results directory
@@ -100,7 +95,7 @@ jobs:
       - name: Archive native image agent results
         uses: actions/upload-artifact@v3
         with:
-          name: native-image-agent-results-${{ matrix.java }}
+          name: native-image-agent-results-java-${{ matrix.java }}
           path: showcase-quarkus-eventsourcing/${{ env.native-image-agent-results-directory }}
           if-no-files-found: error
           retention-days: 5