Add more initial support for merge_queues

Fixup based on comments on previous PR
awslabs · Jan 14, 2025 · d873362 · d873362
1 parent 5c67b96
commit d873362
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -41,33 +41,28 @@ jobs:
       - name: Login to Amazon ECR (trusted)
         id: login-ecr-trusted
         uses: aws-actions/amazon-ecr-login@v1
-        with:
-          mask-password: true
 
       - name: Configure AWS Credentials from Prod account
         uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ vars.PROD_IAM_IMAGE_ROLE }}
           aws-region: ${{ vars.AWS_PROD_ECR_REGION }}
-      - name: Login to Amazon ECR prod
+      - name: Login to Amazon ECR (prod)
         id: login-ecr-prod
         uses: aws-actions/amazon-ecr-login@v1
-        with:
-          mask-password: true
 
       - name: Configure AWS Credentials from Prod account (for ECR public)
         if: ${{ env.PUBLIC_REGISTRY != '' }}
         uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ vars.PROD_IAM_IMAGE_ROLE }}
           aws-region: us-east-1
-      - name: Login to Amazon ECR Public
+      - name: Login to Amazon ECR (public)
         if: ${{ env.PUBLIC_REGISTRY != '' }}
         id: login-ecr-public
         uses: aws-actions/amazon-ecr-login@v1
         with:
           registry-type: public
-          mask-password: true
 
       - name: Promote image
         env:

diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml
@@ -5,6 +5,8 @@ on:
     branches: [ "main", "feature/*" ]
   pull_request:
     branches: [ "main", "feature/*" ]
+  merge_group:
+    types: [ "checks_requested" ]
 
 jobs:
   build: