Skip to content

Commit 0b8c6e3

Browse files
authored
Merge pull request #1242 from carldea/main
Using TCK Tested JDK builds of OpenJDK
2 parents 0567b4e + 691e0fc commit 0b8c6e3

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

.github/workflows/maven-build.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
java: [ 16 ]
16+
java: [ 16, 17 ]
1717
steps:
1818
- uses: actions/checkout@v2
1919
- name: Set up JDK
2020
uses: actions/setup-java@v2
2121
with:
2222
java-version: ${{ matrix.java }}
23-
distribution: 'adopt'
23+
distribution: 'zulu'
2424
- name: Cached .m2
2525
uses: actions/cache@v2.1.6
2626
with:
@@ -39,14 +39,14 @@ jobs:
3939
fail-fast: false
4040
matrix:
4141
os: [ ubuntu, windows ]
42-
java: [ 8, 11, 16 ]
42+
java: [ 8.0.192, 8, 11.0.3, 11, 16, 17 ]
4343
steps:
4444
- uses: actions/checkout@v2
4545
- name: Set up JDK
4646
uses: actions/setup-java@v2
4747
with:
4848
java-version: ${{ matrix.java }}
49-
distribution: 'adopt'
49+
distribution: 'zulu'
5050
- uses: actions/cache@v2.1.6
5151
with:
5252
path: ~/.m2/repository
@@ -55,22 +55,22 @@ jobs:
5555
${{ runner.os }}-maven-
5656
# JDK 8
5757
- name: Maven Install without Code Coverage
58-
if: matrix.os == 'windows' && matrix.java == '8'
58+
if: matrix.os == 'windows' && startsWith(matrix.java, '8')
5959
run: mvn -B clean install --file pom.xml
6060
- name: Maven Install with Code Coverage
61-
if: matrix.os != 'windows' && matrix.java == '8'
61+
if: matrix.os != 'windows' && startsWith(matrix.java, '8')
6262
run: mvn -B clean install -D enable-ci --file pom.xml
6363
- name: Codecov Report
64-
if: matrix.os != 'windows' && matrix.java == '8'
64+
if: matrix.os != 'windows' && startsWith(matrix.java, '8')
6565
uses: codecov/codecov-action@v2.1.0
6666
# JDK 11+
6767
- name: Maven Install without Code Coverage
68-
if: matrix.os == 'windows' && matrix.java != '8'
68+
if: matrix.os == 'windows' && !startsWith(matrix.java, '8')
6969
env:
7070
MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
7171
run: mvn -B clean install --file pom.xml "-Dsurefire.argLine=--add-opens java.base/java.net=ALL-UNNAMED"
7272
- name: Maven Install with Code Coverage
73-
if: matrix.os != 'windows' && matrix.java != '8'
73+
if: matrix.os != 'windows' && !startsWith(matrix.java, '8')
7474
env:
7575
MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
7676
run: mvn -B clean install -D enable-ci --file pom.xml "-Dsurefire.argLine=--add-opens java.base/java.net=ALL-UNNAMED"

0 commit comments

Comments
 (0)