From 4583de350bf003ab39db26c7be7815740c290be7 Mon Sep 17 00:00:00 2001
From: Guillaume Smet <guillaume.smet@gmail.com>
Date: Thu, 10 Nov 2022 15:21:13 +0100
Subject: [PATCH 1/2] Use Mandrel by default for container build

Due to a bug in GraalVM, let's default to using Mandrel containers for
now.

See:
- https://github.com/quarkusio/quarkus/issues/29124
- https://github.com/oracle/graal/issues/5303
---
 .github/workflows/ci-actions-incremental.yml | 2 +-
 build-parent/pom.xml                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-actions-incremental.yml b/.github/workflows/ci-actions-incremental.yml
index aad889150f553..b469366507d1f 100644
--- a/.github/workflows/ci-actions-incremental.yml
+++ b/.github/workflows/ci-actions-incremental.yml
@@ -715,7 +715,7 @@ jobs:
         uses: graalvm/setup-graalvm@v1
         if: startsWith(matrix.os-name, 'windows')
         with:
-          version: 'latest'
+          version: 'mandrel-latest'
           java-version: '17'
           components: 'native-image'
           github-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index adbd39920a7be..40a0561c37f66 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -159,7 +159,7 @@
         <forbiddenapis-maven-plugin.version>3.1</forbiddenapis-maven-plugin.version>
 
         <!-- platform properties - this is a floating tag -->
-        <platform.quarkus.native.builder-image>graalvm</platform.quarkus.native.builder-image>
+        <platform.quarkus.native.builder-image>mandrel</platform.quarkus.native.builder-image>
 
         <script.extension>sh</script.extension>
         <docker-prune.location>${maven.multiModuleProjectDirectory}/.github/docker-prune.${script.extension}</docker-prune.location>

From 1de3eacf1142da9ad89df48e23ffaa4bdf3cf343 Mon Sep 17 00:00:00 2001
From: Foivos Zakkak <fzakkak@redhat.com>
Date: Fri, 11 Nov 2022 08:19:35 +0200
Subject: [PATCH 2/2] Remove gu install native-image command

This is not available for Mandrel and it's also redundant for GraalVM as
it's being taken care of by the setup-graalvm action.
---
 .github/workflows/ci-actions-incremental.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/ci-actions-incremental.yml b/.github/workflows/ci-actions-incremental.yml
index b469366507d1f..694d20eb87b72 100644
--- a/.github/workflows/ci-actions-incremental.yml
+++ b/.github/workflows/ci-actions-incremental.yml
@@ -719,10 +719,6 @@ jobs:
           java-version: '17'
           components: 'native-image'
           github-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Install native-image component
-        if: startsWith(matrix.os-name, 'windows')
-        run: |
-          gu.cmd install native-image
       # We do this so we can get better analytics for the downloaded version of the build images
       - name: Update Docker Client User Agent
         shell: bash