From 5f68ff517c02218234fb7b8511ebd81a55f284bd Mon Sep 17 00:00:00 2001 From: Madison Swain-Bowden Date: Wed, 1 Feb 2023 09:30:43 -0800 Subject: [PATCH 1/2] Update deployment actions using new definitions --- .github/actions/production-deploy/action.yml | 15 ++++++++------- .github/actions/staging-deploy/action.yml | 15 ++++++++------- 2 files changed, 16 insertions(+), 14 deletions(-) mode change 100644 => 100755 .github/actions/production-deploy/action.yml mode change 100644 => 100755 .github/actions/staging-deploy/action.yml diff --git a/.github/actions/production-deploy/action.yml b/.github/actions/production-deploy/action.yml old mode 100644 new mode 100755 index 24336ae49c..6ee3f66e50 --- a/.github/actions/production-deploy/action.yml +++ b/.github/actions/production-deploy/action.yml @@ -5,8 +5,8 @@ # updated version. ### !!! -name: openverse/production-nuxt-nuxt-deploy -description: Update the task definition for a production-nuxt-nuxt deployment +name: openverse/production-nuxt-deploy +description: Update the task definition for a production-nuxt deployment inputs: tag: @@ -84,18 +84,19 @@ runs: # Remove template from the family name (the render action does not support this) sed -i 's/"family": "production-nuxt-template"/"family": "production-nuxt"/g' task-definition.json - - name: Fill in the new image ID in the Amazon ECS task definition - id: task-def - uses: aws-actions/amazon-ecs-render-task-definition@v1 + - name: "Fill in the new nuxt image ID in the Amazon ECS task definition" + id: "task-def-nuxt" + uses: "aws-actions/amazon-ecs-render-task-definition@v1" with: task-definition: task-definition.json container-name: nuxt - image: ghcr.io/wordpress/openverse-frontend:${{ inputs.tag }} + image: "ghcr.io/wordpress/openverse-frontend:${{ inputs.tag }}" + - name: Deploy Amazon ECS task definition uses: aws-actions/amazon-ecs-deploy-task-definition@v1 with: - task-definition: ${{ steps.task-def.outputs.task-definition }} + task-definition: ${{ steps.task-def-nuxt.outputs.task-definition }} service: production-nuxt cluster: production-default wait-for-service-stability: true diff --git a/.github/actions/staging-deploy/action.yml b/.github/actions/staging-deploy/action.yml old mode 100644 new mode 100755 index e9ceaf79b0..457199cd41 --- a/.github/actions/staging-deploy/action.yml +++ b/.github/actions/staging-deploy/action.yml @@ -5,8 +5,8 @@ # updated version. ### !!! -name: openverse/staging-nuxt-nuxt-deploy -description: Update the task definition for a staging-nuxt-nuxt deployment +name: openverse/staging-nuxt-deploy +description: Update the task definition for a staging-nuxt deployment inputs: tag: @@ -84,18 +84,19 @@ runs: # Remove template from the family name (the render action does not support this) sed -i 's/"family": "staging-nuxt-template"/"family": "staging-nuxt"/g' task-definition.json - - name: Fill in the new image ID in the Amazon ECS task definition - id: task-def - uses: aws-actions/amazon-ecs-render-task-definition@v1 + - name: "Fill in the new nuxt image ID in the Amazon ECS task definition" + id: "task-def-nuxt" + uses: "aws-actions/amazon-ecs-render-task-definition@v1" with: task-definition: task-definition.json container-name: nuxt - image: ghcr.io/wordpress/openverse-frontend:${{ inputs.tag }} + image: "ghcr.io/wordpress/openverse-frontend:${{ inputs.tag }}" + - name: Deploy Amazon ECS task definition uses: aws-actions/amazon-ecs-deploy-task-definition@v1 with: - task-definition: ${{ steps.task-def.outputs.task-definition }} + task-definition: ${{ steps.task-def-nuxt.outputs.task-definition }} service: staging-nuxt cluster: staging-default wait-for-service-stability: true From 60805083216128311a43c17ec371564f536f5543 Mon Sep 17 00:00:00 2001 From: Madison Swain-Bowden Date: Wed, 1 Feb 2023 11:23:13 -0800 Subject: [PATCH 2/2] Fix linting errors --- .github/actions/production-deploy/action.yml | 1 - .github/actions/staging-deploy/action.yml | 1 - 2 files changed, 2 deletions(-) mode change 100755 => 100644 .github/actions/production-deploy/action.yml mode change 100755 => 100644 .github/actions/staging-deploy/action.yml diff --git a/.github/actions/production-deploy/action.yml b/.github/actions/production-deploy/action.yml old mode 100755 new mode 100644 index 6ee3f66e50..886ddcf15f --- a/.github/actions/production-deploy/action.yml +++ b/.github/actions/production-deploy/action.yml @@ -92,7 +92,6 @@ runs: container-name: nuxt image: "ghcr.io/wordpress/openverse-frontend:${{ inputs.tag }}" - - name: Deploy Amazon ECS task definition uses: aws-actions/amazon-ecs-deploy-task-definition@v1 with: diff --git a/.github/actions/staging-deploy/action.yml b/.github/actions/staging-deploy/action.yml old mode 100755 new mode 100644 index 457199cd41..5d86dc87f1 --- a/.github/actions/staging-deploy/action.yml +++ b/.github/actions/staging-deploy/action.yml @@ -92,7 +92,6 @@ runs: container-name: nuxt image: "ghcr.io/wordpress/openverse-frontend:${{ inputs.tag }}" - - name: Deploy Amazon ECS task definition uses: aws-actions/amazon-ecs-deploy-task-definition@v1 with: