Skip to content

chore: add merge queue support to required GitHub Actions workflows#5031

Merged
avallete merged 3 commits intodevelopfrom
copilot/update-ci-for-merge-queue
Apr 3, 2026
Merged

chore: add merge queue support to required GitHub Actions workflows#5031
avallete merged 3 commits intodevelopfrom
copilot/update-ci-for-merge-queue

Conversation

Copy link
Copy Markdown
Contributor

Copilot AI commented Apr 3, 2026

GitHub merge queues require required checks to run on the merge_group event, not just pull_request. This updates the repo’s required Actions workflows so queued PRs report the same checks branch protection expects.

  • CI workflow

    • Add merge_group as a trigger to .github/workflows/ci.yml
    • Keep existing PR and push behavior unchanged
    • Update the link job condition so merge queue runs do not access pull_request-only payload fields
  • CodeQL workflow

    • Add merge_group as a trigger to .github/workflows/codeql-analysis.yml
    • Ensure security scanning continues to report required checks for queued merges
  • Event-safe job gating

    • Scope the fork check to pull_request runs and allow merge_group runs explicitly
on:
  pull_request:
  merge_group:
  push:
    branches:
      - develop

# ...

if: ${{ github.event_name == 'merge_group' || (github.event_name == 'pull_request' && !github.event.pull_request.head.repo.fork) }}

Agent-Logs-Url: https://github.com/supabase/cli/sessions/956fab18-300f-4c6c-8e28-57242abff9e1

Co-authored-by: avallete <8771783+avallete@users.noreply.github.com>
@avallete avallete changed the title Add merge queue support to required GitHub Actions workflows chore: Add merge queue support to required GitHub Actions workflows Apr 3, 2026
@avallete avallete changed the title chore: Add merge queue support to required GitHub Actions workflows chore: add merge queue support to required GitHub Actions workflows Apr 3, 2026
@avallete avallete marked this pull request as ready for review April 3, 2026 07:29
@coveralls
Copy link
Copy Markdown

coveralls commented Apr 3, 2026

Pull Request Test Coverage Report for Build 23938589670

Details

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • 5 unchanged lines in 1 file lost coverage.
  • Overall coverage decreased (-0.02%) to 63.181%

Files with Coverage Reduction New Missed Lines %
internal/utils/git.go 5 57.14%
Totals Coverage Status
Change from base Build 23938014091: -0.02%
Covered Lines: 9220
Relevant Lines: 14593

💛 - Coveralls

@jgoux jgoux self-requested a review April 3, 2026 07:56
@avallete avallete merged commit 40bdcc6 into develop Apr 3, 2026
15 checks passed
@avallete avallete deleted the copilot/update-ci-for-merge-queue branch April 3, 2026 08:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants