Skip to content

Commit

Permalink
Merge pull request #29182 from gsmet/mandrel-by-default
Browse files Browse the repository at this point in the history
Use Mandrel by default for container build
  • Loading branch information
gsmet authored Nov 15, 2022
2 parents ea38c17 + 1de3eac commit d4965e1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/ci-actions-incremental.yml
Original file line number Diff line number Diff line change
Expand Up @@ -715,14 +715,10 @@ 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 }}
- 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
Expand Down
2 changes: 1 addition & 1 deletion build-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit d4965e1

Please sign in to comment.