From 8994ca0285a784b5634bd1c48fd0aa074f4dea66 Mon Sep 17 00:00:00 2001 From: David Crossley Date: Wed, 29 Oct 2025 16:44:35 +1100 Subject: [PATCH 1/7] Use actions/checkout v5 DEVOPS-2662 --- .github/workflows/build-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml index 424f66c..7aca464 100644 --- a/.github/workflows/build-deploy.yml +++ b/.github/workflows/build-deploy.yml @@ -20,7 +20,7 @@ jobs: pull-requests: write steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Set up JDK uses: actions/setup-java@v4 with: From ec1aaae78bb7c636412ae9acd12ea431b770660c Mon Sep 17 00:00:00 2001 From: David Crossley Date: Wed, 29 Oct 2025 16:45:07 +1100 Subject: [PATCH 2/7] Use actions/setup-java v5 DEVOPS-2662 --- .github/workflows/build-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml index 7aca464..97ebe98 100644 --- a/.github/workflows/build-deploy.yml +++ b/.github/workflows/build-deploy.yml @@ -22,7 +22,7 @@ jobs: steps: - uses: actions/checkout@v5 - name: Set up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: ${{ env.JAVA_VERSION }} distribution: 'adopt' From 8ad5b5e79b3de5e85069bb478ec0c6c3c348ae96 Mon Sep 17 00:00:00 2001 From: David Crossley Date: Wed, 29 Oct 2025 16:45:50 +1100 Subject: [PATCH 3/7] Use actions-hub/kubectl v1.34.1 DEVOPS-2662 --- .github/workflows/build-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml index 97ebe98..fb7a551 100644 --- a/.github/workflows/build-deploy.yml +++ b/.github/workflows/build-deploy.yml @@ -66,7 +66,7 @@ jobs: - name: Deploy latest to K8s if: ${{ github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' }} - uses: actions-hub/kubectl@v1.21.2 + uses: actions-hub/kubectl@v1.34.1 env: KUBE_CONFIG: ${{ secrets.RESHARE_DEV_SA_KUBECONFIG }} with: From 01ef6a204335120cc1a51601d3024fb56ae473f8 Mon Sep 17 00:00:00 2001 From: David Crossley Date: Wed, 29 Oct 2025 17:51:34 +1100 Subject: [PATCH 4/7] Enable workflow_dispatch --- .github/workflows/build-deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml index fb7a551..7b89357 100644 --- a/.github/workflows/build-deploy.yml +++ b/.github/workflows/build-deploy.yml @@ -8,6 +8,7 @@ env: JAVA_VERSION: 8 on: push: + workflow_dispatch: jobs: build: From 70735df32f9773d02c0174116139edf5150f961a Mon Sep 17 00:00:00 2001 From: David Crossley Date: Wed, 29 Oct 2025 17:56:30 +1100 Subject: [PATCH 5/7] Try revert to actions/setup-java v4 DEVOPS-2662 --- .github/workflows/build-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml index 7b89357..6fa4439 100644 --- a/.github/workflows/build-deploy.yml +++ b/.github/workflows/build-deploy.yml @@ -23,7 +23,7 @@ jobs: steps: - uses: actions/checkout@v5 - name: Set up JDK - uses: actions/setup-java@v5 + uses: actions/setup-java@v4 with: java-version: ${{ env.JAVA_VERSION }} distribution: 'adopt' From 92fc06c42cc39cae3bfb0af8ff5013e5f5f67190 Mon Sep 17 00:00:00 2001 From: David Crossley Date: Wed, 29 Oct 2025 18:02:25 +1100 Subject: [PATCH 6/7] Use actions/setup-java v5 DEVOPS-2662 --- .github/workflows/build-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml index 6fa4439..7b89357 100644 --- a/.github/workflows/build-deploy.yml +++ b/.github/workflows/build-deploy.yml @@ -23,7 +23,7 @@ jobs: steps: - uses: actions/checkout@v5 - name: Set up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: ${{ env.JAVA_VERSION }} distribution: 'adopt' From eda311729dfa9aafd5e1a34e4caeda3c38c0065d Mon Sep 17 00:00:00 2001 From: David Crossley Date: Wed, 29 Oct 2025 18:52:48 +1100 Subject: [PATCH 7/7] Use Java 21 and cache DEVOPS-2662 --- .github/workflows/build-deploy.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml index 7b89357..0d8f5ec 100644 --- a/.github/workflows/build-deploy.yml +++ b/.github/workflows/build-deploy.yml @@ -5,7 +5,7 @@ env: IMAGE_NAME: ${{ github.repository }} K8S_NAMESPACE: reshare K8S_DEPLOYMENT: oai-pmh-viewer - JAVA_VERSION: 8 + JAVA_VERSION: 21 on: push: workflow_dispatch: @@ -26,7 +26,8 @@ jobs: uses: actions/setup-java@v5 with: java-version: ${{ env.JAVA_VERSION }} - distribution: 'adopt' + distribution: 'temurin' + cache: 'maven' - run: mvn install