Skip to content

Commit bfbe25e

Browse files
Do not skip CI jobs for merge queue events. (#2356)
* Do not skip for merge queue events. * Fix quotes.
1 parent b3b3393 commit bfbe25e

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

.github/workflows/ci-pr.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ name: CI
77
on:
88
pull_request:
99
merge_group:
10+
types: [checks_requested]
1011

1112
# Allow one instance of this workflow per pull request, and cancel older runs when new changes are pushed
1213
concurrency:
@@ -22,7 +23,7 @@ jobs:
2223
# The login password is encrypted with the repo secret DOCKER_LOGIN_TOKEN_PASSPHRASE
2324
save-docker-login-token:
2425
name: Save a docker login token
25-
if: ${{ github.event.pull_request.head.repo.full_name == 'awslabs/smithy-rs' }}
26+
if: ${{ github.event.pull_request.head.repo.full_name == 'awslabs/smithy-rs' || toJSON(github.event.merge_group) != '{}' }}
2627
outputs:
2728
docker-login-password: ${{ steps.set-token.outputs.docker-login-password }}
2829
permissions:
@@ -52,7 +53,7 @@ jobs:
5253
acquire-base-image:
5354
name: Acquire Base Image
5455
needs: save-docker-login-token
55-
if: ${{ github.event.pull_request.head.repo.full_name == 'awslabs/smithy-rs' }}
56+
if: ${{ github.event.pull_request.head.repo.full_name == 'awslabs/smithy-rs' || toJSON(github.event.merge_group) != '{}' }}
5657
runs-on: ubuntu-latest
5758
env:
5859
ENCRYPTED_DOCKER_PASSWORD: ${{ needs.save-docker-login-token.outputs.docker-login-password }}
@@ -87,7 +88,7 @@ jobs:
8788
needs:
8889
- save-docker-login-token
8990
- acquire-base-image
90-
if: ${{ github.event.pull_request.head.repo.full_name == 'awslabs/smithy-rs' }}
91+
if: ${{ github.event.pull_request.head.repo.full_name == 'awslabs/smithy-rs' || toJSON(github.event.merge_group) != '{}' }}
9192
uses: ./.github/workflows/ci.yml
9293
with:
9394
run_sdk_examples: true
@@ -98,7 +99,7 @@ jobs:
9899
# The PR bot requires a Docker build image, so make it depend on the `acquire-base-image` job.
99100
pr_bot:
100101
name: PR Bot
101-
if: ${{ github.event.pull_request.head.repo.full_name == 'awslabs/smithy-rs' }}
102+
if: ${{ github.event.pull_request.head.repo.full_name == 'awslabs/smithy-rs' || toJSON(github.event.merge_group) != '{}' }}
102103
needs: acquire-base-image
103104
uses: ./.github/workflows/pull-request-bot.yml
104105
with:

0 commit comments

Comments
 (0)