mirror of
https://github.com/stleary/JSON-java.git
synced 2025-08-05 20:35:37 -04:00
Merge branch 'master' into issue748
This commit is contained in:
commit
7fe2fd95a5
38
.github/workflows/deployment.yml
vendored
38
.github/workflows/deployment.yml
vendored
@ -11,10 +11,37 @@ on:
|
|||||||
types: [published]
|
types: [published]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
publish:
|
# old-school build and jar method. No tests run or compiled.
|
||||||
|
publish-1_6:
|
||||||
|
name: Publish Java 1.6 to GitHub Release
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
permissions:
|
permissions:
|
||||||
contents: read
|
contents: write
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- name: Setup java
|
||||||
|
uses: actions/setup-java@v1
|
||||||
|
with:
|
||||||
|
java-version: 1.6
|
||||||
|
- name: Compile Java 1.6
|
||||||
|
run: |
|
||||||
|
mkdir -p target/classes
|
||||||
|
javac -version
|
||||||
|
javac -source 1.6 -target 1.6 -d target/classes/ src/main/java/org/json/*.java
|
||||||
|
- name: Create JAR 1.6
|
||||||
|
run: |
|
||||||
|
jar cvf "target/org.json-1.6-${{ github.ref_name }}.jar" -C target/classes .
|
||||||
|
- name: Add 1.6 Jar To Release
|
||||||
|
uses: softprops/action-gh-release@v1
|
||||||
|
with:
|
||||||
|
append_body: true
|
||||||
|
files: |
|
||||||
|
target/*.jar
|
||||||
|
publish:
|
||||||
|
name: Publish Java 8 to Maven Central and GitHub Release
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
packages: write
|
packages: write
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
@ -36,6 +63,13 @@ jobs:
|
|||||||
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
|
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
|
||||||
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
|
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
|
||||||
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
|
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
|
||||||
|
|
||||||
|
- name: Add Jar To Release
|
||||||
|
uses: softprops/action-gh-release@v1
|
||||||
|
with:
|
||||||
|
append_body: true
|
||||||
|
files: |
|
||||||
|
target/*.jar
|
||||||
# - name: Set up Java for publishing to GitHub Packages
|
# - name: Set up Java for publishing to GitHub Packages
|
||||||
# uses: actions/setup-java@v3
|
# uses: actions/setup-java@v3
|
||||||
# with:
|
# with:
|
||||||
|
26
.github/workflows/pipeline.yml
vendored
26
.github/workflows/pipeline.yml
vendored
@ -10,9 +10,35 @@ on:
|
|||||||
branches: [ master ]
|
branches: [ master ]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
# old-school build and jar method. No tests run or compiled.
|
||||||
|
build-1_6:
|
||||||
|
name: Java 1.6
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- name: Setup java
|
||||||
|
uses: actions/setup-java@v1
|
||||||
|
with:
|
||||||
|
java-version: 1.6
|
||||||
|
- name: Compile Java 1.6
|
||||||
|
run: |
|
||||||
|
mkdir -p target/classes
|
||||||
|
javac -version
|
||||||
|
javac -source 1.6 -target 1.6 -d target/classes/ src/main/java/org/json/*.java
|
||||||
|
- name: Create java 1.6 JAR
|
||||||
|
run: |
|
||||||
|
jar cvf target/org.json.jar -C target/classes .
|
||||||
|
- name: Upload JAR 1.6
|
||||||
|
if: ${{ always() }}
|
||||||
|
uses: actions/upload-artifact@v3
|
||||||
|
with:
|
||||||
|
name: Create java 1.6 JAR
|
||||||
|
path: target/*.jar
|
||||||
build:
|
build:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
strategy:
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
max-parallel: 2
|
||||||
matrix:
|
matrix:
|
||||||
# build against supported Java LTS versions:
|
# build against supported Java LTS versions:
|
||||||
java: [ 8, 11, 17, 21 ]
|
java: [ 8, 11, 17, 21 ]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user