remove unneeded matrix build typ for java 1.6 · michael-ameri/JSON-java@ea842b4 · GitHub

michael-ameri / JSON-java Public

forked from stleary/JSON-java

• Notifications You must be signed in to change notification settings
• Fork 0
• Star 0

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit ea842b4

Browse filesBrowse the repository at this point in the historyBrowse files

John J. Aylward

committed

remove unneeded matrix build typ for java 1.6

1 parent a2a8240 commit ea842b4
Copy full SHA for ea842b4

2 files changed

+13-17Lines changed: 13 additions & 17 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• .github/workflows
  • deployment.yml
  • pipeline.yml

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎.github/workflows/deployment.yml‎

Copy file name to clipboardExpand all lines: .github/workflows/deployment.yml

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -27,7 +27,7 @@ jobs:
27	27	run: |
28	28	mkdir -p target/classes
29	29	javac -version
30		- javac -d target/classes/ src/main/java/org/json/*.java
	30	+ javac -source 1.6 -target 1.6 -d target/classes/ src/main/java/org/json/*.java
31	31	- name: Create JAR 1.6
32	32	run: |
33	33	jar cvf "target/org.json-1.6-${{ github.ref_name }}.jar" -C target/classes .

Collapse file

‎.github/workflows/pipeline.yml‎

Copy file name to clipboardExpand all lines: .github/workflows/pipeline.yml

+12-16Lines changed: 12 additions & 16 deletions

Original file line number	Diff line number	Diff line change
@@ -12,31 +12,27 @@ on:
12	12	jobs:
13	13	# old-school build and jar method. No tests run or compiled.
14	14	build-1_6:
	15	+ name: Java 1.6
15	16	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 }}
21	17	steps:
22	18	- uses: actions/checkout@v4
23	19	- name: Setup java
24	20	uses: actions/setup-java@v1
25	21	with:
26		- java-version: ${{ matrix.java }}
27		- - name: Compile Java ${{ matrix.java }}
	22	+ java-version: 1.6
	23	+ - name: Compile Java 1.6
28	24	run: |
29	25	mkdir -p target/classes
30	26	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
33	29	run: |
34	30	jar cvf target/org.json.jar -C target/classes .
35		- - name: Upload JAR ${{ matrix.java }}
	31	+ - name: Upload JAR 1.6
36	32	if: ${{ always() }}
37	33	uses: actions/upload-artifact@v3
38	34	with:
39		- name: Create java ${{ matrix.java }} JAR
	35	+ name: Create java 1.6 JAR
40	36	path: target/*.jar
41	37	build:
42	38	runs-on: ubuntu-latest
@@ -56,15 +52,15 @@ jobs:
56	52	java-version: ${{ matrix.java }}
57	53	cache: 'maven'
58	54	- 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
60	56	- name: Run Tests ${{ matrix.java }}
61	57	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 }}
63	59	- name: Build Test Report ${{ matrix.java }}
64	60	if: ${{ always() }}
65	61	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 }}
68	64	- name: Upload Test Results ${{ matrix.java }}
69	65	if: ${{ always() }}
70	66	uses: actions/upload-artifact@v3
@@ -78,7 +74,7 @@ jobs:
78	74	name: Test Report ${{ matrix.java }}
79	75	path: target/site/
80	76	- 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
82	78	- name: Upload Package Results ${{ matrix.java }}
83	79	if: ${{ always() }}
84	80	uses: actions/upload-artifact@v3

0 commit comments

Comments

0 (0)