Skip to content

Commit ea49284

Browse files
committed
Merge remote-tracking branch 'origin/develop'
2 parents d55d189 + 08f2416 commit ea49284

File tree

4 files changed

+32
-6
lines changed

4 files changed

+32
-6
lines changed

.github/workflows/build_fj-doc-native-quarkus_test.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,14 @@ on:
2525

2626
jobs:
2727
build:
28-
name: Build
29-
runs-on: ubuntu-latest
28+
runs-on: ${{ matrix.os }}
29+
strategy:
30+
matrix:
31+
distribution: [ 'graalvm' ]
32+
java: [ '21', '23' ]
33+
os: [ 'ubuntu-latest' ]
34+
name: Build native image ${{ matrix.os }} ${{ matrix.java }} (${{ matrix.distribution }})
35+
3036
steps:
3137

3238
# checkout
@@ -37,8 +43,8 @@ jobs:
3743
# setup latest GraalVM LTS
3844
- uses: actions/setup-java@main
3945
with:
40-
distribution: 'graalvm' # See 'Supported distributions' for available options
41-
java-version: '21'
46+
distribution: ${{ matrix.distribution }}
47+
java-version: ${{ matrix.java }}
4248

4349
- name: Cache Maven packages
4450
uses: actions/cache@main

.github/workflows/build_maven_compatibility.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,23 @@ jobs:
4848
java-version: ${{ matrix.java }}
4949
- name: Maven build
5050
run: mvn clean install -P full,coverage
51+
check-graal:
52+
runs-on: ${{ matrix.os }}
53+
strategy:
54+
matrix:
55+
distribution: [ 'graalvm' ]
56+
java: [ '21', '23' ]
57+
os: [ 'ubuntu-latest' ]
58+
name: Java ${{ matrix.os }} ${{ matrix.java }} (${{ matrix.distribution }}) compatibility check
59+
steps:
60+
- uses: actions/checkout@main
61+
- name: Setup java
62+
uses: actions/setup-java@main
63+
with:
64+
distribution: ${{ matrix.distribution }}
65+
java-version: ${{ matrix.java }}
66+
- name: Maven build
67+
run: mvn clean install -P full,coverage
5168
check-ms:
5269
runs-on: ${{ matrix.os }}
5370
strategy:

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
### Added
11+
12+
- better native AOT compatibility workflow
13+
1014
## [8.11.9] - 2025-01-11
1115

1216
### Fixed

fj-doc-native-quarkus/src/main/resources/application.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@ greeting:
33

44
quarkus:
55
native:
6-
additional-build-args: -H:+UnlockExperimentalVMOptions,\
7-
-H:IncludeResources=fj-doc-native-quarkus/fm-doc-process-config.xml,\
6+
additional-build-args: -H:IncludeResources=fj-doc-native-quarkus/fm-doc-process-config.xml,\
87
-H:IncludeResources=fj-doc-native-quarkus/template/document.ftl

0 commit comments

Comments
 (0)