From 8b6a113981228e0bfa534a793ff4b3571b090bcb Mon Sep 17 00:00:00 2001 From: Aaron J Todd Date: Mon, 23 Oct 2023 10:03:43 -0400 Subject: [PATCH 1/2] chore(ci): allow workflow on merge queues --- .github/workflows/codebuild-ci.yml | 4 ++-- .github/workflows/release-check.yml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codebuild-ci.yml b/.github/workflows/codebuild-ci.yml index d3bcdd1b74b..3e33d81bbd8 100644 --- a/.github/workflows/codebuild-ci.yml +++ b/.github/workflows/codebuild-ci.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v2 + uses: aws-actions/configure-aws-credentials@v4 with: role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }} aws-region: us-west-2 @@ -45,7 +45,7 @@ jobs: - name: Checkout sources uses: actions/checkout@v2 - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v2 + uses: aws-actions/configure-aws-credentials@v4 with: role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }} aws-region: us-west-2 diff --git a/.github/workflows/release-check.yml b/.github/workflows/release-check.yml index c522c660eab..cb81fcdd8fc 100644 --- a/.github/workflows/release-check.yml +++ b/.github/workflows/release-check.yml @@ -3,7 +3,8 @@ name: Release Checks on: pull_request: types: [ opened, synchronize, reopened ] - branches: [ main ] + branches: [ main, release ] + merge_group: # Allow one instance of this workflow per pull request, and cancel older runs when new changes are pushed concurrency: From e0fe5d356d4f22f7e7a4ba1dc67943a9d425b92b Mon Sep 17 00:00:00 2001 From: Aaron J Todd Date: Mon, 23 Oct 2023 10:45:18 -0400 Subject: [PATCH 2/2] remove merge group --- .github/workflows/release-check.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release-check.yml b/.github/workflows/release-check.yml index cb81fcdd8fc..908d5695ec3 100644 --- a/.github/workflows/release-check.yml +++ b/.github/workflows/release-check.yml @@ -4,7 +4,6 @@ on: pull_request: types: [ opened, synchronize, reopened ] branches: [ main, release ] - merge_group: # Allow one instance of this workflow per pull request, and cancel older runs when new changes are pushed concurrency: