From fe712845978e492568affd5a23b7f357d44d9e54 Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 30 Jan 2024 22:54:37 -0500 Subject: [PATCH 1/7] update ci --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3058ff0..666fa84 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,16 +7,16 @@ jobs: jpo-sdw-depositor: runs-on: ubuntu-latest container: - image: openjdk:17-jdk-slim-buster + image: openjdk:21-jdk-slim-buster options: --user root steps: - name: Checkout ${{ github.event.repository.name }} - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Maven uses: stCarolas/setup-maven@v4.5 with: maven-version: 3.8.2 - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: java-version: '21' distribution: 'temurin' From 3c19763881b35c8a44f745521af15e34abcfad06 Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 31 Jan 2024 10:10:16 -0500 Subject: [PATCH 2/7] revert json version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f2bf84f..921458e 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ org.json json - 20231013 + 20230227 org.springframework.boot From 9a6579beb711877d7ea5da2054bd3717771bdf55 Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 31 Jan 2024 10:16:56 -0500 Subject: [PATCH 3/7] revert json version --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 666fa84..0c9a5ae 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,16 +7,16 @@ jobs: jpo-sdw-depositor: runs-on: ubuntu-latest container: - image: openjdk:21-jdk-slim-buster + image: openjdk:17-jdk-slim-buster options: --user root steps: - name: Checkout ${{ github.event.repository.name }} - uses: actions/checkout@v4 + uses: actions/checkout@v3 - name: Set up Maven uses: stCarolas/setup-maven@v4.5 with: maven-version: 3.8.2 - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v3 with: java-version: '21' distribution: 'temurin' From d3ae35e42f830efcd8b3fdcfbe58d66b45862696 Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 31 Jan 2024 10:26:00 -0500 Subject: [PATCH 4/7] update ci --- .github/workflows/ci.yml | 2 ++ .github/workflows/docker.yml | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0c9a5ae..7a6ab82 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,7 +1,9 @@ name: CI on: pull_request: + types: [opened, reopened, synchronize] push: + branches: [develop, master] jobs: jpo-sdw-depositor: diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index e79a28d..d1b4403 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -1,11 +1,6 @@ name: Docker build on: - push: - branches-ignore: - - "develop" - - "master" - - "release/*" pull_request: types: [opened, synchronize, reopened] From 475e3886cd674ea94de60bcfd1f450a1038b0267 Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 31 Jan 2024 11:46:01 -0500 Subject: [PATCH 5/7] downgrade java v --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7a6ab82..13fcd8f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: maven-version: 3.8.2 - uses: actions/setup-java@v3 with: - java-version: '21' + java-version: '11' distribution: 'temurin' - name: Build run: | From 98b03e8337590d25ae6eb4cd4b814a3c213349dd Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 31 Jan 2024 11:54:04 -0500 Subject: [PATCH 6/7] attempt to fix java --- .github/workflows/ci.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 13fcd8f..a083242 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ jobs: jpo-sdw-depositor: runs-on: ubuntu-latest container: - image: openjdk:17-jdk-slim-buster + image: openjdk:21-jdk-slim-buster options: --user root steps: - name: Checkout ${{ github.event.repository.name }} @@ -17,11 +17,7 @@ jobs: - name: Set up Maven uses: stCarolas/setup-maven@v4.5 with: - maven-version: 3.8.2 - - uses: actions/setup-java@v3 - with: - java-version: '11' - distribution: 'temurin' + maven-version: 3.8.2 - name: Build run: | cd $GITHUB_WORKSPACE From 5176ebeedc8e74972964d5e1d40c1519f2b30f2a Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 31 Jan 2024 11:57:00 -0500 Subject: [PATCH 7/7] attempt to fix java --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 921458e..f2bf84f 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ org.json json - 20230227 + 20231013 org.springframework.boot