From c8428b1a36099278fb38becffc85be7a6e157a95 Mon Sep 17 00:00:00 2001
From: Milenko Supic <supic82@gmail.com>
Date: Wed, 20 Sep 2023 16:24:02 +0200
Subject: [PATCH] Fixed graalvm-oci github workflow (#712)

* Fixed graalvm-oci workflow

* Fixed graalvm-oci workflow
---
 .github/workflows/graalvm-oci.yml | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/graalvm-oci.yml b/.github/workflows/graalvm-oci.yml
index 8b751f066..d1fe3cc6b 100644
--- a/.github/workflows/graalvm-oci.yml
+++ b/.github/workflows/graalvm-oci.yml
@@ -41,7 +41,6 @@ jobs:
     runs-on: ${{ needs.start-runner.outputs.label }}
     strategy:
       matrix:
-        graalvm: [ 'latest' ]
         java: [ '17' ]
     steps:
       - uses: AutoModality/action-clean@1.1.0
@@ -52,23 +51,26 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
-      - name: Setup GraalVM CE
-        uses: graalvm/setup-graalvm@v1
+      - name: "Set up JAVA_HOME for Gradle"
+        uses: actions/setup-java@v3.12.0
         with:
-          version: ${{ matrix.graalvm }}
+          distribution: 'oracle'
+          java-version: '17'
+      - name: "Set up GRAALVM_HOME for Native Build Tools"
+        uses: graalvm/setup-graalvm@v1.1.3.1
+        with:
+          distribution: 'graalvm-community'
           java-version: ${{ matrix.java }}
           components: 'native-image'
-          github-token: ${{ secrets.GITHUB_TOKEN }}
+          set-java-home: 'false'
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
       - name: Build with Gradle
         id: gradle
         run: |
-          if ./gradlew tasks --no-daemon --all | grep -w "testNativeImage"
+          if ./gradlew tasks --no-daemon --all | grep -w "nativeTest"
           then
-            ./gradlew check testNativeImage --continue --no-daemon
-          else
-            ./gradlew check --continue --no-daemon
+            ./gradlew nativeTest --continue --no-daemon
           fi
         env:
            MICRONAUT_ENV_DEDUCTION: false
@@ -104,7 +106,7 @@ jobs:
               issue_number: context.issue.number,
               owner: context.repo.owner,
               repo: context.repo.repo,
-              body: '❌ ${{ github.workflow }} ${{ matrix.java }} ${{ matrix.graalvm }} failed: ${{ steps.gradle.outputs.build-scan-url }}'
+              body: '❌ ${{ github.workflow }} ${{ matrix.java }} latest failed: ${{ steps.gradle.outputs.build-scan-url }}'
             })
       - name: Publish Test Report
         if: always()