Skip to content

Commit e7e5627

Browse files
authored
Merge pull request #200 from mini-software/fix/java10-surefire-diagnostics
Stabilize JDK 10 Java CI
2 parents f154bc0 + 8340a44 commit e7e5627

2 files changed

Lines changed: 16 additions & 6 deletions

File tree

‎.github/workflows/java-ci.yml‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,18 @@ jobs:
8585

8686
- name: Test on JDK 10
8787
if: matrix.java-version == '10'
88-
# JDK 10 predates cgroup v2 support and can exit during startup on
89-
# current hosted runners while reading their container configuration.
90-
run: |
91-
"$JAVA_HOME_10_X64/bin/java" -XX:-UseContainerSupport -version
92-
./mvnw -B -ntp -Djvm="$JAVA_HOME_10_X64/bin/java" -DargLine=-XX:-UseContainerSupport verify
88+
# HotSpot 10 intermittently exits in compiled mode on hosted runner
89+
# CPUs. Keep Maven on JDK 17 and run only compatibility tests in the
90+
# JDK 10 interpreter.
91+
run: ./mvnw -B -ntp -Djvm="$JAVA_HOME_10_X64/bin/java" -DargLine="-Xint -XX:-UseContainerSupport" verify
92+
93+
- name: Upload JDK 10 crash diagnostics
94+
if: failure() && matrix.java-version == '10'
95+
uses: actions/upload-artifact@v4
96+
with:
97+
name: java-10-crash-diagnostics
98+
path: |
99+
minipdf-java/**/target/surefire-reports/**
100+
minipdf-java/**/hs_err_pid*.log
101+
if-no-files-found: warn
102+
retention-days: 3

‎minipdf-java/minipdf/src/main/java/io/github/minisoftware/minipdf/internal/xlsx/PoiXlsxRenderer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2281,9 +2281,9 @@ private static PDFont loadCollectionFont(PDDocument document, Path path) throws
22812281
private static List<Path> cjkSystemFonts() {
22822282
if (!FontEmbeddingPolicy.shouldSubset()) {
22832283
return systemFonts(
2284+
"wqy-microhei.ttc",
22842285
"unifont.ttf",
22852286
"NotoSansSC-VF.ttf",
2286-
"wqy-microhei.ttc",
22872287
"NotoSansCJK-Regular.ttc",
22882288
"simhei.ttf",
22892289
"simsun.ttc");

0 commit comments

Comments
 (0)