Skip to content

Commit 40b9a29

Browse files
author
John J. Aylward
committed
remove unneeded matrix build typ for java 1.6
1 parent a2a8240 commit 40b9a29

File tree

1 file changed

+12
-16
lines changed

1 file changed

+12
-16
lines changed

.github/workflows/pipeline.yml

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,27 @@ on:
1212
jobs:
1313
# old-school build and jar method. No tests run or compiled.
1414
build-1_6:
15+
name: Java 1.6
1516
runs-on: ubuntu-latest
16-
strategy:
17-
matrix:
18-
# build for java 1.6, however don't run any tests
19-
java: [ 1.6 ]
20-
name: Java ${{ matrix.java }}
2117
steps:
2218
- uses: actions/checkout@v4
2319
- name: Setup java
2420
uses: actions/setup-java@v1
2521
with:
26-
java-version: ${{ matrix.java }}
27-
- name: Compile Java ${{ matrix.java }}
22+
java-version: 1.6
23+
- name: Compile Java 1.6
2824
run: |
2925
mkdir -p target/classes
3026
javac -version
31-
javac -d target/classes/ src/main/java/org/json/*.java
32-
- name: Create java ${{ matrix.java }} JAR
27+
javac -source 1.6 -target 1.6 -d target/classes/ src/main/java/org/json/*.java
28+
- name: Create java 1.6 JAR
3329
run: |
3430
jar cvf target/org.json.jar -C target/classes .
35-
- name: Upload JAR ${{ matrix.java }}
31+
- name: Upload JAR 1.6
3632
if: ${{ always() }}
3733
uses: actions/upload-artifact@v3
3834
with:
39-
name: Create java ${{ matrix.java }} JAR
35+
name: Create java 1.6 JAR
4036
path: target/*.jar
4137
build:
4238
runs-on: ubuntu-latest
@@ -56,15 +52,15 @@ jobs:
5652
java-version: ${{ matrix.java }}
5753
cache: 'maven'
5854
- name: Compile Java ${{ matrix.java }}
59-
run: mvn clean compile -Dmaven.compiler.source=${{ matrix.java }} -Dmaven.compiler.target=${{ matrix.java }} -Dmaven.test.skip=true -Dmaven.site.skip=true -Dmaven.javadoc.skip=true
55+
run: mvn clean compile -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} -D maven.test.skip=true -D maven.site.skip=true -D maven.javadoc.skip=true
6056
- name: Run Tests ${{ matrix.java }}
6157
run: |
62-
mvn test -Dmaven.compiler.source=${{ matrix.java }} -Dmaven.compiler.target=${{ matrix.java }}
58+
mvn test -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }}
6359
- name: Build Test Report ${{ matrix.java }}
6460
if: ${{ always() }}
6561
run: |
66-
mvn surefire-report:report-only -Dmaven.compiler.source=${{ matrix.java }} -Dmaven.compiler.target=${{ matrix.java }}
67-
mvn site -DgenerateReports=false -Dmaven.compiler.source=${{ matrix.java }} -Dmaven.compiler.target=${{ matrix.java }}
62+
mvn surefire-report:report-only -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }}
63+
mvn site -D generateReports=false -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }}
6864
- name: Upload Test Results ${{ matrix.java }}
6965
if: ${{ always() }}
7066
uses: actions/upload-artifact@v3
@@ -78,7 +74,7 @@ jobs:
7874
name: Test Report ${{ matrix.java }}
7975
path: target/site/
8076
- name: Package Jar ${{ matrix.java }}
81-
run: mvn clean package -Dmaven.compiler.source=${{ matrix.java }} -Dmaven.compiler.target=${{ matrix.java }} -Dmaven.test.skip=true -Dmaven.site.skip=true
77+
run: mvn clean package -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }} -D maven.test.skip=true -D maven.site.skip=true
8278
- name: Upload Package Results ${{ matrix.java }}
8379
if: ${{ always() }}
8480
uses: actions/upload-artifact@v3

0 commit comments

Comments
 (0)