Skip to content

Commit e7bc130

Browse files
committed
Update frank_grimes_java-21-ffm
1 parent f4779eb commit e7bc130

File tree

2 files changed

+26
-9
lines changed

2 files changed

+26
-9
lines changed

.github/workflows/auto-jdk-matrix.yml

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,24 @@ env:
1616
jobs:
1717
build:
1818
name: Build, Test, Install
19-
runs-on: ubuntu-latest
2019

2120
strategy:
2221
fail-fast: false
2322
matrix:
24-
jdk: [ 21 ]
23+
jdk: [ 21 ] # LTS versions only
24+
os: [ ubuntu-latest ]
25+
include:
26+
# - os: windows-latest
27+
# skip_javadoc: "`-Dmaven`.javadoc`.skip=true"
28+
# skip_gpg: "`-Dgpg`.skip=true"
29+
- os: ubuntu-latest
30+
skip_javadoc: -Dmaven.javadoc.skip=true
31+
skip_gpg: -Dgpg.skip=true
32+
# - os: macos-latest
33+
# skip_javadoc: -Dmaven.javadoc.skip=true
34+
# skip_gpg: -Dgpg.skip=true
35+
36+
runs-on: ${{matrix.os}}
2537

2638
env:
2739
JDK_VERSION: ${{ matrix.jdk }}
@@ -32,10 +44,6 @@ jobs:
3244
with:
3345
persist-credentials: false
3446

35-
- name: Print Current workflow
36-
run: >
37-
cat .github/workflows/auto-jdk-matrix.yml
38-
3947
- name: Cache local Maven repository
4048
uses: actions/cache@v4
4149
with:
@@ -49,12 +57,16 @@ jobs:
4957
java-version: ${{ matrix.jdk }}
5058
distribution: 'temurin'
5159
java-package: jdk
52-
architecture: x64
60+
architecture: x64
5361

5462
- name: Echo Java Version
5563
run: >
5664
java -version
5765
66+
- name: Print Current workflow
67+
run: >
68+
cat .github/workflows/auto-jdk-matrix.yml
69+
5870
- name: Test
5971
run: >
6072
mvn clean test -B
@@ -64,8 +76,9 @@ jobs:
6476
- name: Install
6577
run: >
6678
mvn clean install -B
79+
${{matrix.os.skip_javadoc}}
6780
-DskipTests=true
68-
-Dgpg.skip=true
81+
${{matrix.os.skip_gpg}}
6982
7083
# Architecture options: x86, x64, armv7, aarch64, ppc64le
7184
# setup-java@v4 has a "with cache" option

.github/workflows/auto-os-matrix.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,10 @@ jobs:
6464
run: >
6565
java -version
6666
67+
- name: Print Current workflow
68+
run: >
69+
cat .github/workflows/auto-os-matrix.yml
70+
6771
- name: Test
6872
run: >
6973
mvn clean test
@@ -74,7 +78,7 @@ jobs:
7478
run: >
7579
mvn clean install -B
7680
${{matrix.os.skip_javadoc}}
77-
-D skipTests=true
81+
-DskipTests=true
7882
${{matrix.os.skip_gpg}}
7983
8084
# Architecture options: x86, x64, armv7, aarch64, ppc64le

0 commit comments

Comments
 (0)