diff --git a/.github/workflows/check_cla.yml b/.github/workflows/check_cla.yml index f204597..f6e4196 100644 --- 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 index bfef6a1..cf7b774 100644 --- 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: