Skip to content

Commit ea840bd

Browse files
authored
Merge pull request #3921 from duncdrum/ci-j16
fix(ci): add J16 and allow failures
2 parents bf9487e + ed734c9 commit ea840bd

File tree

3 files changed

+26
-7
lines changed

3 files changed

+26
-7
lines changed

.github/workflows/ci-build.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
jdk: ['8', '11']
1111
include:
1212
- os: ubuntu-latest
13-
jdk: '15'
13+
jdk: '16'
1414
runs-on: ${{ matrix.os }}
1515
steps:
1616
- uses: actions/checkout@v2
@@ -26,5 +26,10 @@ jobs:
2626
restore-keys: ${{ runner.os }}-m2
2727
# NOTE(AR) The `-T 2C` enables multi-threaded builds below, faster, but may need to be disabled when diagnosing problems
2828
# NOTE(DP): Reuse of build artefacts across workflows to (hopefully) limit network traffic
29+
- name: Maven Build allow fail
30+
if: ${{ matrix.jdk == '16' }}
31+
run: mvn -V -B -q -T 2C -DskipTests=true "-Dmaven.javadoc.skip=true" install
32+
continue-on-error: true
2933
- name: Maven Build
34+
if: ${{ matrix.jdk != '16' }}
3035
run: mvn -V -B -q -T 2C -DskipTests=true "-Dmaven.javadoc.skip=true" install

.github/workflows/ci-docs.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,30 @@ name: Javadoc
22
on: [push, pull_request]
33
jobs:
44
test:
5-
name: Generate Javadocs
5+
name: ${{ matrix.jdk }} Javadocs
6+
strategy:
7+
matrix:
8+
jdk: ['8','11', '16']
69
runs-on: ubuntu-latest
710
steps:
811
- uses: actions/checkout@v2
912
with:
1013
fetch-depth: 0
11-
- name: Set up JDK 8
14+
- name: Set up JDK
1215
uses: actions/setup-java@v1
1316
with:
14-
java-version: '8'
17+
java-version: ${{ matrix.jdk }}
1518
- name: Cache Maven packages
1619
uses: actions/cache@v2
1720
with:
1821
path: ~/.m2
1922
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
2023
restore-keys: ${{ runner.os }}-m2
2124
- name: Maven Javadoc
22-
run: mvn -V -B -q -T 2C javadoc:javadoc
25+
if: ${{ matrix.jdk == '8' }}
26+
run: mvn -V -B -q -T 2C javadoc:javadoc
27+
- name: Maven Javadoc allow fail
28+
if: ${{ matrix.jdk != '8' }}
29+
run: mvn -V -B -q -T 2C javadoc:javadoc
30+
continue-on-error: true
31+

.github/workflows/ci-test.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
jdk: ['8', '11']
1111
include:
1212
- os: ubuntu-latest
13-
jdk: '15'
13+
jdk: '16'
1414
runs-on: ${{ matrix.os }}
1515
steps:
1616
- uses: actions/checkout@v2
@@ -24,8 +24,13 @@ jobs:
2424
path: ~/.m2
2525
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
2626
restore-keys: ${{ runner.os }}-m2
27-
- name: Maven Test
27+
- name: Maven Test allow fail
28+
if: ${{ matrix.jdk == '16' }}
2829
run: mvn -V -B clean verify
30+
continue-on-error: true
31+
- name: Maven Test
32+
if: ${{ matrix.jdk != '16' }}
33+
run: mvn -V -B clean verify
2934
- name: Maven Code Coverage
3035
if: ${{ github.ref == 'refs/heads/develop' && matrix.jdk == '8' && matrix.os == 'ubuntu-latest' }}
3136
env:

0 commit comments

Comments
 (0)