Backups/JSON-java
1
0
Fork 0
mirror of https://github.com/stleary/JSON-java.git synced 2025-08-03 11:25:30 -04:00
Code Issues Projects Releases Wiki Activity

remove unneeded matrix build typ for java 1.6

Browse Source
This commit is contained in:
John J. Aylward 2023-10-23 17:11:55 -04:00
parent a2a8240d0d
commit ea842b437c
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/deployment.yml vendored
View File

@ -27,7 +27,7 @@ jobs:
run: | run: |
mkdir -p target/classes mkdir -p target/classes
javac -version javac -version
javac -d target/classes/ src/main/java/org/json/*.java javac -source 1.6 -target 1.6 -d target/classes/ src/main/java/org/json/*.java
- name: Create JAR 1.6 - name: Create JAR 1.6
run: | run: |
jar cvf "target/org.json-1.6-${{ github.ref_name }}.jar" -C target/classes . jar cvf "target/org.json-1.6-${{ github.ref_name }}.jar" -C target/classes .

28
.github/workflows/pipeline.yml vendored
View File

@ -12,31 +12,27 @@ on:
jobs: jobs:
# old-school build and jar method. No tests run or compiled. # old-school build and jar method. No tests run or compiled.
build-1_6: build-1_6:
name: Java 1.6
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy:
matrix:
# build for java 1.6, however don't run any tests
java: [ 1.6 ]
name: Java ${{ matrix.java }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Setup java - name: Setup java
uses: actions/setup-java@v1 uses: actions/setup-java@v1
with: with:
java-version: ${{ matrix.java }} java-version: 1.6
- name: Compile Java ${{ matrix.java }} - name: Compile Java 1.6
run: | run: |
mkdir -p target/classes mkdir -p target/classes
javac -version javac -version
javac -d target/classes/ src/main/java/org/json/*.java javac -source 1.6 -target 1.6 -d target/classes/ src/main/java/org/json/*.java
- name: Create java ${{ matrix.java }} JAR - name: Create java 1.6 JAR
run: | run: |
jar cvf target/org.json.jar -C target/classes . jar cvf target/org.json.jar -C target/classes .
- name: Upload JAR ${{ matrix.java }} - name: Upload JAR 1.6
if: ${{ always() }} if: ${{ always() }}
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: Create java ${{ matrix.java }} JAR name: Create java 1.6 JAR
path: target/*.jar path: target/*.jar
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -56,15 +52,15 @@ jobs:
java-version: ${{ matrix.java }} java-version: ${{ matrix.java }}
cache: 'maven' cache: 'maven'
- name: Compile Java ${{ matrix.java }} - name: Compile Java ${{ matrix.java }}
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 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
- name: Run Tests ${{ matrix.java }} - name: Run Tests ${{ matrix.java }}
run: | run: |
mvn test -Dmaven.compiler.source=${{ matrix.java }} -Dmaven.compiler.target=${{ matrix.java }} mvn test -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }}
- name: Build Test Report ${{ matrix.java }} - name: Build Test Report ${{ matrix.java }}
if: ${{ always() }} if: ${{ always() }}
run: | run: |
mvn surefire-report:report-only -Dmaven.compiler.source=${{ matrix.java }} -Dmaven.compiler.target=${{ matrix.java }} mvn surefire-report:report-only -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }}
mvn site -DgenerateReports=false -Dmaven.compiler.source=${{ matrix.java }} -Dmaven.compiler.target=${{ matrix.java }} mvn site -D generateReports=false -D maven.compiler.source=${{ matrix.java }} -D maven.compiler.target=${{ matrix.java }}
- name: Upload Test Results ${{ matrix.java }} - name: Upload Test Results ${{ matrix.java }}
if: ${{ always() }} if: ${{ always() }}
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
@ -78,7 +74,7 @@ jobs:
name: Test Report ${{ matrix.java }} name: Test Report ${{ matrix.java }}
path: target/site/ path: target/site/
- name: Package Jar ${{ matrix.java }} - name: Package Jar ${{ matrix.java }}
run: mvn clean package -Dmaven.compiler.source=${{ matrix.java }} -Dmaven.compiler.target=${{ matrix.java }} -Dmaven.test.skip=true -Dmaven.site.skip=true 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
- name: Upload Package Results ${{ matrix.java }} - name: Upload Package Results ${{ matrix.java }}
if: ${{ always() }} if: ${{ always() }}
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3