Consolidate push and deploy actions for staging ci (#86)

* Consolidate image publishing and re-deploying in staging

* Only allow building production images from main branch

* Add list of commits to the tag message

* Disable staging deployment for the current branch

* Debug extracting git commits

* Remove tag messages for now

Author: pgetta

.github/workflows/publish-production-image.yml

@@ -13,6 +13,12 @@ jobs:
       ENVIRONMENT: staging
       IMAGE_NAME: ${{ vars.PUBLICECR_URI }}
     steps:
+      - name: Fail if branch is not main
+        if: github.event_name == 'workflow_dispatch' && github.ref != 'refs/heads/main'
+        run: |
+          echo "This workflow should not be triggered with workflow_dispatch on a branch other than main"
+          exit 1
+
       - name: Checkout repository
         uses: actions/checkout@v4
         with:

.github/workflows/publish-staging-image.yml

@@ -1,4 +1,4 @@
-name: Publish STAGING image
+name: Deploy to STAGING
 
 on:
   push:
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  publish-image:
+  deploy-staging:
     runs-on: ubuntu-latest
     env:
       ENVIRONMENT: staging
@@ -23,7 +23,7 @@ jobs:
           aws-secret-access-key: ${{ secrets.PUBLICECR_UPLOAD_SECRET_ACCESS_KEY }}
           aws-region: ${{ vars.PUBLICECR_REGION }}
 
-      - name: Authenticate with AWS Public ECR
+      - name: Authenticate with AWS ECR
         uses: aws-actions/amazon-ecr-login@v2
         with:
           registry-type: public
@@ -35,3 +35,22 @@ jobs:
       - name: Publish To AWS ECR
         run: |
           docker push ${{ vars.PUBLICECR_URI }}:staging
+
+      - name: Authenticate with AWS ECS
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${{ vars.AWS_STAGING_ECS_REDEPLOY_ROLE_ARN }}
+          aws-region: ${{ vars.AWS_STAGING_REGION }}
+
+      - name: Trigger new deployment
+        run: |
+          aws ecs update-service \
+            --cluster ${{ vars.AWS_STAGING_ECS_CLUSTER }} \
+            --service ${{ vars.AWS_STAGING_ECS_SERVICE }} \
+            --force-new-deployment
+
+      - name: Wait until the service is stable
+        run: |
+          aws ecs wait services-stable \
+            --cluster ${{ vars.AWS_STAGING_ECS_CLUSTER }} \
+            --service ${{ vars.AWS_STAGING_ECS_SERVICE }}