Merge remote-tracking branch 'origin/develop'

fugerit-org · Jan 14, 2025 · ea49284 · ea49284
2 parents d55d189 + 08f2416
commit ea49284
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 6 deletions.
diff --git a/.github/workflows/build_fj-doc-native-quarkus_test.yml b/.github/workflows/build_fj-doc-native-quarkus_test.yml
@@ -25,8 +25,14 @@ on:
 
 jobs:
   build:
-    name: Build
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        distribution: [ 'graalvm' ]
+        java: [ '21', '23' ]
+        os: [ 'ubuntu-latest' ]
+    name: Build native image ${{ matrix.os }} ${{ matrix.java }} (${{ matrix.distribution }})
+
     steps:
 
       # checkout
@@ -37,8 +43,8 @@ jobs:
       # setup latest GraalVM LTS
       - uses: actions/setup-java@main
         with:
-          distribution: 'graalvm' # See 'Supported distributions' for available options
-          java-version: '21'
+          distribution: ${{ matrix.distribution }}
+          java-version: ${{ matrix.java }}
 
       - name: Cache Maven packages
         uses: actions/cache@main

diff --git a/.github/workflows/build_maven_compatibility.yml b/.github/workflows/build_maven_compatibility.yml
@@ -48,6 +48,23 @@ jobs:
           java-version: ${{ matrix.java }}
       - name: Maven build
         run: mvn clean install -P full,coverage
+  check-graal:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        distribution: [ 'graalvm' ]
+        java: [ '21', '23' ]
+        os: [ 'ubuntu-latest' ]
+    name: Java ${{ matrix.os }} ${{ matrix.java }} (${{ matrix.distribution }}) compatibility check
+    steps:
+      - uses: actions/checkout@main
+      - name: Setup java
+        uses: actions/setup-java@main
+        with:
+          distribution: ${{ matrix.distribution }}
+          java-version: ${{ matrix.java }}
+      - name: Maven build
+        run: mvn clean install -P full,coverage
   check-ms:
     runs-on: ${{ matrix.os }}
     strategy:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- better native AOT compatibility workflow
+
 ## [8.11.9] - 2025-01-11
 
 ### Fixed

diff --git a/fj-doc-native-quarkus/src/main/resources/application.yml b/fj-doc-native-quarkus/src/main/resources/application.yml
@@ -3,6 +3,5 @@ greeting:
 
 quarkus:
   native:
-    additional-build-args: -H:+UnlockExperimentalVMOptions,\
-      -H:IncludeResources=fj-doc-native-quarkus/fm-doc-process-config.xml,\
+    additional-build-args: -H:IncludeResources=fj-doc-native-quarkus/fm-doc-process-config.xml,\
       -H:IncludeResources=fj-doc-native-quarkus/template/document.ftl