Merge branch 'main' into fix-build-image-actions-bump

FlowFuse · May 7, 2024 · cb15900 · cb15900
2 parents 97a6d00 + 817e6de
commit cb15900
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/deploy_container_image.yml b/.github/workflows/deploy_container_image.yml
@@ -72,7 +72,7 @@ jobs:
 
       - name: Configure AWS credentials
         id: aws-config
-        uses: aws-actions/configure-aws-credentials@v3
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-access-key-id: ${{ secrets.aws_access_key_id }}
           aws-secret-access-key: ${{ secrets.aws_secret_access_key }}
@@ -81,7 +81,7 @@ jobs:
 
       - name: Login to AWS ECR
         id: login-ecr
-        uses: aws-actions/amazon-ecr-login@v1
+        uses: aws-actions/amazon-ecr-login@v2
         with:
           mask-password: 'true'
 
@@ -94,7 +94,7 @@ jobs:
           password: ${{ secrets.temporary_registry_token }}
 
       - name: Push image to ECR
-        uses: akhilerm/tag-push-action@v2.1.0
+        uses: akhilerm/tag-push-action@v2.2.0
         with:
           src: ${{ inputs.image }}
           dst: |
@@ -103,7 +103,7 @@ jobs:
 
       - name: Configure AWS credentials for EKS interaction
         if: ${{fromJson( inputs.deploy )}}
-        uses: aws-actions/configure-aws-credentials@v3
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-access-key-id: ${{ secrets.aws_access_key_id }}
           aws-secret-access-key: ${{ secrets.aws_secret_access_key }}
@@ -113,7 +113,7 @@ jobs:
 
       - name: Setup kubectl
         if: ${{fromJson( inputs.deploy )}}
-        uses: azure/setup-kubectl@v3
+        uses: azure/setup-kubectl@v4
         with:
           version: ${{ inputs.kubectl_version }}
 

diff --git a/.github/workflows/merge_multiarch_images.yml b/.github/workflows/merge_multiarch_images.yml
@@ -42,7 +42,7 @@ jobs:
           echo "repository_owner_lower=${GITHUB_REPOSITORY_OWNER,,}" >> $GITHUB_ENV
 
       - name: Login to temporary registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{github.actor}}
@@ -55,7 +55,7 @@ jobs:
           suffixes: ${{ inputs.architecture_suffixes}}
 
       - name: Prune old images
-        uses: actions/delete-package-versions@v4
+        uses: actions/delete-package-versions@v5
         with: 
           package-name: ${{ inputs.image_name }}
           package-type: 'container'