Merge pull request #37 from dfinity/add-merge-group-back

Add merge group back
dfinity · Oct 31, 2023 · f8c4ef9 · f8c4ef9
2 parents 9a67073 + bc94c64
commit f8c4ef9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/workflows/check_cla.yml b/.github/workflows/check_cla.yml
@@ -10,7 +10,7 @@ jobs:
     name: Check Membership
     runs-on: ubuntu-latest
     # Dont run this workflow if it was triggered by one of these bots
-    if:  ${{ github.event.pull_request.user.login != 'dependabot[bot]' && github.event.pull_request.user.login != 'github-actions[bot]' && github.event.pull_request.user.login != 'sa-github-api' }}
+    if:  ${{ github.event.pull_request.user.login != 'dependabot[bot]' && github.event.pull_request.user.login != 'github-actions[bot]' && github.event.pull_request.user.login != 'sa-github-api' && github.event_name != 'merge_group' }}
     outputs:
       is_member: ${{ steps.check-membership.outputs.is_member}}
     steps:

diff --git a/.github/workflows/check_cla_ruleset.yml b/.github/workflows/check_cla_ruleset.yml
@@ -9,6 +9,7 @@ on:
     branches:
       - 'master'
       - 'main'
+  merge_group:
 
 jobs:
   call-check-cla: