From 2bbbcf4c1317920bdca863dba9099b948c43fcee Mon Sep 17 00:00:00 2001 From: Xavier Schildwachter Date: Wed, 27 Dec 2023 15:39:53 -0800 Subject: [PATCH 1/4] GH CI + version --- .github/workflows/build.yaml | 41 ++++++++++++++++++++++++++++++++++++ pom.xml | 2 +- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/build.yaml diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml new file mode 100644 index 000000000..88611e6ac --- /dev/null +++ b/.github/workflows/build.yaml @@ -0,0 +1,41 @@ +name: test and deploy + +on: + push: + branches: [ "develop" ] + pull_request: + branches: [ "develop" ] + +jobs: + deploy: + if: github.event_name == 'push' + 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: deploy + run: mvn -B deploy + env: + MAVEN_USERNAME: ${{ secrets.ARTIFACTORY_USER }} + MAVEN_USERPWD: ${{ secrets.ARTIFACTORY_PWD }} + test: + if: github.event_name == 'pull_request' + 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' + - name: test + run: mvn -B test 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 From 971e89ce82679541b477e7ccc1f4049d983eeb9e Mon Sep 17 00:00:00 2001 From: Xavier Schildwachter Date: Mon, 15 Jan 2024 20:02:27 -0800 Subject: [PATCH 2/4] CI --- .github/workflows/build.yaml | 4 ++-- .github/workflows/main.yaml | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/main.yaml diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 88611e6ac..aba77a738 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -24,8 +24,8 @@ jobs: - name: deploy run: mvn -B deploy env: - MAVEN_USERNAME: ${{ secrets.ARTIFACTORY_USER }} - MAVEN_USERPWD: ${{ secrets.ARTIFACTORY_PWD }} + MAVEN_USERNAME: ${{ secrets.PLATFORM_ARTIFACTORY_USER }} + MAVEN_USERPWD: ${{ secrets.PLATFORM_ARTIFACTORY_PWD }} test: if: github.event_name == 'pull_request' runs-on: ubuntu-latest 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 + From 5727c17248981700a41ab173ba95d168c3be1468 Mon Sep 17 00:00:00 2001 From: Xavier Schildwachter Date: Mon, 15 Jan 2024 20:04:40 -0800 Subject: [PATCH 3/4] Missed --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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/ + From 8ba451913587b2f2a16d635dd89161e7c662b22b Mon Sep 17 00:00:00 2001 From: Xavier Schildwachter Date: Wed, 17 Jan 2024 11:32:07 -0800 Subject: [PATCH 4/4] Update --- .github/workflows/build.yaml | 58 ++++++++++++++---------------------- 1 file changed, 22 insertions(+), 36 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index aba77a738..12e2a0acf 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,41 +1,27 @@ -name: test and deploy - +name: build on: - push: - branches: [ "develop" ] - pull_request: - branches: [ "develop" ] + workflow_call: + inputs: + mvn_goal: + required: true + type: string jobs: - deploy: - if: github.event_name == 'push' - 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: deploy - run: mvn -B deploy - env: - MAVEN_USERNAME: ${{ secrets.PLATFORM_ARTIFACTORY_USER }} - MAVEN_USERPWD: ${{ secrets.PLATFORM_ARTIFACTORY_PWD }} - test: - if: github.event_name == 'pull_request' + 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' - - name: test - run: mvn -B test + - 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 }}