Skip to content

Commit 93eaa7c

Browse files
authored
Merge pull request hub4j#1399 from hub4j/bitwiseman-patch-1
chore: update CI matrix and configuration
2 parents a35c1f6 + caba262 commit 93eaa7c

1 file changed

Lines changed: 27 additions & 16 deletions

File tree

.github/workflows/maven-build.yml

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
java: [ 16, 17 ]
24+
java: [ 17 ]
2525
steps:
2626
- uses: actions/checkout@v2
2727
- name: Set up JDK
@@ -40,7 +40,7 @@ jobs:
4040
strategy:
4141
fail-fast: false
4242
matrix:
43-
java: [ 8, 11 ]
43+
java: [ 11 ]
4444
steps:
4545
- uses: actions/checkout@v2
4646
- name: Set up JDK
@@ -51,14 +51,14 @@ jobs:
5151
cache: 'maven'
5252
- name: Maven Site
5353
run: mvn -B clean site -D enable-ci --file pom.xml
54-
test:
55-
name: test (${{ matrix.os }}, Java ${{ matrix.java }})
54+
test-8:
55+
name: test (${{ matrix.os }}, Java 8)
5656
runs-on: ${{ matrix.os }}-latest
5757
strategy:
5858
fail-fast: false
5959
matrix:
60-
os: [ ubuntu, windows ]
61-
java: [ 8.0.192, 8, 11.0.3, 11, 16, 17 ]
60+
os: [ ubuntu ]
61+
java: [ 8 ]
6262
steps:
6363
- uses: actions/checkout@v2
6464
- name: Set up JDK
@@ -68,23 +68,34 @@ jobs:
6868
distribution: 'zulu'
6969
cache: 'maven'
7070
# JDK 8
71-
- name: Maven Install without Code Coverage
72-
if: matrix.os == 'windows' && startsWith(matrix.java, '8')
73-
run: mvn -B clean install --file pom.xml
7471
- name: Maven Install with Code Coverage
75-
if: matrix.os != 'windows' && startsWith(matrix.java, '8')
76-
run: mvn -B clean install -D enable-ci --file pom.xml
72+
run: mvn -B clean install -D enable-ci -Djapicmp.skip --file pom.xml
7773
- name: Codecov Report
78-
if: matrix.os != 'windows' && startsWith(matrix.java, '8')
79-
uses: codecov/codecov-action@v2.1.0
74+
uses: codecov/codecov-action@v2.1.0
75+
test:
76+
name: test (${{ matrix.os }}, Java ${{ matrix.java }})
77+
runs-on: ${{ matrix.os }}-latest
78+
strategy:
79+
fail-fast: false
80+
matrix:
81+
os: [ ubuntu, windows ]
82+
java: [ 11.0.3, 11, 17 ]
83+
steps:
84+
- uses: actions/checkout@v2
85+
- name: Set up JDK
86+
uses: actions/setup-java@v2
87+
with:
88+
java-version: ${{ matrix.java }}
89+
distribution: 'zulu'
90+
cache: 'maven'
8091
# JDK 11+
8192
- name: Maven Install without Code Coverage
82-
if: matrix.os == 'windows' && !startsWith(matrix.java, '8')
93+
if: matrix.os == 'windows'
8394
env:
8495
MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
85-
run: mvn -B clean install --file pom.xml "-Dsurefire.argLine=--add-opens java.base/java.net=ALL-UNNAMED"
96+
run: mvn -B clean install -D japicmp.skip=true --file pom.xml "-Dsurefire.argLine=--add-opens java.base/java.net=ALL-UNNAMED"
8697
- name: Maven Install with Code Coverage
87-
if: matrix.os != 'windows' && !startsWith(matrix.java, '8')
98+
if: matrix.os != 'windows'
8899
env:
89100
MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
90101
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)