Merge branch 'main' into story/ccmspui-379_implement_get_client_details

ministryofjustice · Feb 21, 2025 · 64a5a5a · 64a5a5a
2 parents f14f600 + 62d9cbe
commit 64a5a5a
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/.github/workflows/feature-branch.yml b/.github/workflows/feature-branch.yml
@@ -26,7 +26,7 @@ jobs:
     outputs:
       app_version: ${{ steps.capture_version.outputs.app_version }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Capture version
         shell: bash
@@ -38,7 +38,7 @@ jobs:
           echo "app_version=${BRANCH_NAME}-${COMMIT_HASH}-SNAPSHOT" >> $GITHUB_OUTPUT
 
       - name: Set up JDK 21
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '21'
           distribution: 'temurin'
@@ -98,21 +98,21 @@ jobs:
       id-token: write # for requesting jwt
       contents: read  # for actions/checkout
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Download jar
         uses: actions/download-artifact@v4
         with:
           name: data-api-jar
 
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v2
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ secrets.ECR_ROLE_TO_ASSUME }}
           aws-region: ${{ vars.ECR_REGION }}
 
       - name: Login ECR
-        uses: aws-actions/amazon-ecr-login@v1
+        uses: aws-actions/amazon-ecr-login@v2
         id: login-ecr
 
       - name: Build and push image
@@ -126,7 +126,7 @@ jobs:
           docker push $REGISTRY/$REPOSITORY:${{ env.REPO_NAME }}-${{ env.APP_VERSION }}
 
       - name: Delete artifact
-        uses: geekyeggo/delete-artifact@v2
+        uses: geekyeggo/delete-artifact@v5
         with:
           name: data-api-jar
 
@@ -135,7 +135,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout charts repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ministryofjustice/laa-ccms-caab-helm-charts
           ref: development

diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml
@@ -34,9 +34,9 @@ jobs:
     outputs:
       app_version: ${{ steps.capture_version.outputs.app_version }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 21
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '21'
           distribution: 'temurin'
@@ -75,21 +75,21 @@ jobs:
       contents: read  # for actions/checkout
     steps:
       # Checkout github repo
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       # Assume role in cloud platform
       - name: download jar
         uses: actions/download-artifact@v4
         with:
           name: data-api-jar
 
       - name: Configure aws credentials
-        uses: aws-actions/configure-aws-credentials@v2
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ secrets.ECR_ROLE_TO_ASSUME }}
           aws-region: ${{ vars.ECR_REGION }}
 
       - name: Login ecr
-        uses: aws-actions/amazon-ecr-login@v1
+        uses: aws-actions/amazon-ecr-login@v2
         id: login-ecr
 
       # Build and push docker image to container repo
@@ -105,7 +105,7 @@ jobs:
           docker push $REGISTRY/$REPOSITORY:${{ env.REPO_NAME }}-${{ env.APP_VERSION }}
 
       - name: delete artifact
-        uses: geekyeggo/delete-artifact@v2
+        uses: geekyeggo/delete-artifact@v5
         with:
           name: data-api-jar
 
@@ -114,7 +114,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout charts repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ministryofjustice/laa-ccms-caab-helm-charts
           ref: development

diff --git a/.github/workflows/pr-merge-main.yml b/.github/workflows/pr-merge-main.yml
@@ -22,12 +22,12 @@ jobs:
       github.event.pull_request.merged == true && !startsWith(github.event.pull_request.head.ref, 'dependabot/')
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: main
           token: ${{ secrets.REPO_TOKEN }}
       - name: Set up JDK 21
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '21'
           distribution: 'temurin'
@@ -92,7 +92,7 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Generate Snyk report and upload to LAA Dashboard
         uses: snyk/actions/gradle@0.4.0
         continue-on-error: true

diff --git a/.github/workflows/push-branch.yml b/.github/workflows/push-branch.yml
@@ -22,9 +22,9 @@ jobs:
   build-test-publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 21
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '21'
           distribution: 'temurin'
@@ -84,9 +84,9 @@ jobs:
       SNYK_TARGET_REFERENCE: main
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 21
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '21'
           distribution: 'temurin'