diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml new file mode 100644 index 000000000..12e2a0acf --- /dev/null +++ b/.github/workflows/build.yaml @@ -0,0 +1,27 @@ +name: build +on: + workflow_call: + inputs: + mvn_goal: + required: true + type: string + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 8 + uses: actions/setup-java@v3 + with: + java-version: 8 + distribution: corretto + cache: 'maven' + server-id: sagebionetworks + server-username: MAVEN_USERNAME + server-password: MAVEN_USERPWD + - name: Build with Maven + run: mvn -B ${{ inputs.mvn_goal }} --file pom.xml + env: + MAVEN_USERNAME: ${{ secrets.PLATFORM_ARTIFACTORY_USER }} + MAVEN_USERPWD: ${{ secrets.PLATFORM_ARTIFACTORY_PWD }} diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml new file mode 100644 index 000000000..5b4a3acfd --- /dev/null +++ b/.github/workflows/main.yaml @@ -0,0 +1,22 @@ +name: build-main + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + call-build: + if: github.event_name == 'push' + uses: ./.github/workflows/build.yaml + with: + mvn_goal: deploy + secrets: inherit + call-test: + if: github.event_name == 'pull_request' + uses: ./.github/workflows/build.yaml + with: + mvn_goal: test + secrets: inherit + diff --git a/.gitignore b/.gitignore index 0a4d9ca6c..dd1417273 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,6 @@ target/ .project .pydevproject .DS_Store -*.pyc +*.pyci +.idea/ + diff --git a/pom.xml b/pom.xml index 007e819a1..b7c7e44f6 100755 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.json JSON-Java - 1.2 + 1.3 jar JSON-Java sagebionetworks fork of the JSON-Java project