Merge pull request #35 from dfinity/test-without-merge-group

Test if status check runs on merge queue
dfinity · Oct 31, 2023 · 0f0b986 · 0f0b986
2 parents 32cc440 + 65657b8
commit 0f0b986
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/.github/workflows/check_cla.yml b/.github/workflows/check_cla.yml
@@ -10,8 +10,7 @@ jobs:
  name: Check Membership
  runs-on: ubuntu-latest
  # Dont run this workflow if it was triggered by one of these bots
- # Don't run it during a merge queue, as it can't correctly identify the actor
- 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' }}
+ 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' }}
  outputs:
  is_member: ${{ steps.check-membership.outputs.is_member}}
  steps: