diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bcc0600246a07..2a8c095235fe5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -686,3 +686,23 @@ jobs: - name: Check for unrunnable tests run: ./ci/scripts/check-unrunnable-tests.sh continue-on-error: true + + # The branch protection will gate on "Merge blocker" and we use these jobs with conditional names to + # gate on different jobs for merge queue and pull request checks. + merge_blocker_pr: + # If names need interpolation, GitHub will only do it if conditions are met. + name: ${{ 'Merge blocker' }} + runs-on: ubuntu-latest + needs: quick_lint + if: ${{ github.event_name == 'pull_request' }} + steps: + - name: Complete + run: 'true' + merge_blocker_merge: + name: ${{ 'Merge blocker' }} + runs-on: ubuntu-latest + needs: cache_bitstreams + if: ${{ github.event_name == 'merge_group' }} + steps: + - name: Complete + run: 'true'