Add merge_group trigger support to status-checks workflow #7163

Copilot · 2025-11-07T17:50:57Z

Closes #

The status-checks workflow only ran on pull request events, preventing it from overriding integration test statuses when PRs enter the merge queue.

Changelog

Changed

status-checks.yml now triggers on merge_group events (scoped to main branch)
Workflow uses a single github-ui job with conditional steps:
- Token generation step runs once for both event types
- "Override status checks for pull request" step runs conditionally when event is pull_request
- "Override status checks for merge queue" step runs conditionally when event is merge_group
Pull request step uses environment variables ($PR_NUMBER and $SHA) for cleaner code and gets timeline event ID for the label
Merge queue step extracts PR number from head_ref (format: refs/heads/gh-readonly-queue/main/pr-{number}-{sha}), validates extraction, and always passes status checks without label verification
Repository URL now uses github.repository context variable instead of hardcoded value

Rollout strategy

Patch release
Minor release
Major release; if selected, include a written rollout or migration plan
None; workflow-only change, no user-facing impact

Testing & Reviewing

The workflow will trigger in two scenarios:

Pull Request: When a PR has the integration-tests: skipped manually label, it overrides status checks
Merge Queue: Automatically passes status checks for any PR in the merge queue, regardless of labels

The single job structure with conditional steps allows for shared token generation while maintaining clean separation of logic between pull request and merge queue events. Environment variables are used for better code readability and maintainability.

Merge checklist

Added/updated tests
Added/updated documentation
Added/updated previews (Storybook)
Changes are SSR compatible
Tested in Chrome
Tested in Firefox
Tested in Safari
Tested in Edge
(GitHub staff only) Integration tests pass at github/github (Learn more about how to run integration tests)

Original prompt

Update the status-checks.yml workflow to also work with the merge queue trigger/event

💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.

changeset-bot · 2025-11-07T17:51:01Z

⚠️ No Changeset found

Latest commit: 0539ce9

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

Co-authored-by: joshblack <3901764+joshblack@users.noreply.github.com>

…epository Co-authored-by: joshblack <3901764+joshblack@users.noreply.github.com>

joshblack

@copilot can you split this logic into two jobs, one that runs if it's merge queue and one that runs if it's a pull request, instead of combining into a single job

Co-authored-by: joshblack <3901764+joshblack@users.noreply.github.com>

Copilot · 2025-11-07T18:16:36Z

@copilot can you split this logic into two jobs, one that runs if it's merge queue and one that runs if it's a pull request, instead of combining into a single job

Done! Split into two separate jobs: github-ui-pull-request for pull request events and github-ui-merge-queue for merge queue events. Each job now has its own dedicated logic without conditional branching. Commit: 8c0dbfa

joshblack

@copilot instead of two separate jobs actually can you split these into two separate steps under the github-ui job that run conditionally based on if they are a pull request or merge queue

Co-authored-by: joshblack <3901764+joshblack@users.noreply.github.com>

Copilot · 2025-11-07T18:23:46Z

@copilot instead of two separate jobs actually can you split these into two separate steps under the github-ui job that run conditionally based on if they are a pull request or merge queue

Done! Refactored to a single github-ui job with two conditional steps: "Override status checks for pull request" runs when event_name == 'pull_request' and "Override status checks for merge queue" runs when event_name == 'merge_group'. The token generation step is now shared between both. Commit: 59048df

joshblack · 2025-11-07T18:30:50Z

.github/workflows/status-checks.yml

        run: |
          # Get the timeline event ID for the label being added
-          EVENT_ID=$(gh api "/repos/primer/react/issues/$PR_NUMBER/timeline" \
+          EVENT_ID=$(gh api "/repos/primer/react/issues/${{ github.event.pull_request.number }}/timeline" \


@copilot refactor this to use $PR_NUMBER as an env variable set to this value

Done! Refactored to use $PR_NUMBER as an environment variable. Commit: f71e44b

joshblack · 2025-11-07T18:30:59Z

.github/workflows/status-checks.yml

          fi

-          gh api -X POST "/repos/primer/react/statuses/$SHA" \
+          gh api -X POST "/repos/primer/react/statuses/${{ github.event.pull_request.head.sha }}" \


@copilot refactor this to use $SHA as an env variable set to this value

Done! Refactored to use $SHA as an environment variable. Commit: f71e44b

joshblack · 2025-11-07T18:31:02Z

.github/workflows/status-checks.yml

            -f target_url="$TARGET_URL"

-          gh api -X POST "/repos/primer/react/statuses/$SHA" \
+          gh api -X POST "/repos/primer/react/statuses/${{ github.event.pull_request.head.sha }}" \


@copilot refactor this to use $SHA as an env variable set to this value

Done! Refactored to use $SHA as an environment variable. Commit: f71e44b

joshblack · 2025-11-07T18:31:33Z

.github/workflows/status-checks.yml

+          # Extract PR number from head_ref
+          # Format: refs/heads/gh-readonly-queue/main/pr-123-abc123
+          PR_NUMBER=$(echo "${{ github.event.merge_group.head_ref }}" | sed -n 's/^refs\/heads\/gh-readonly-queue\/[^\/]*\/pr-\([0-9]*\)-.*/\1/p')
+          
+          # Validate PR_NUMBER extraction
+          if [ -z "$PR_NUMBER" ]; then
+            echo "Error: Failed to extract PR number from head_ref: ${{ github.event.merge_group.head_ref }}"
+            exit 1
+          fi
+
+          # Check if the PR has the required label
+          HAS_LABEL=$(gh api "/repos/primer/react/issues/$PR_NUMBER" \
+            --jq '[.labels[].name] | contains(["integration-tests: skipped manually"])')
+          
+          if [ "$HAS_LABEL" != "true" ]; then
+            echo "PR #$PR_NUMBER does not have the required label. Skipping status override."
+            exit 0
+          fi
+
+          # Use the PR URL as the target URL
+          TARGET_URL="https://github.com/${{ github.repository }}/pull/$PR_NUMBER"


@copilot remove this, we always want this check to pass when in merge queue

Done! Removed the label check for merge queue - the workflow now always passes status checks when triggered by merge_group events. Commit: f71e44b

Co-authored-by: joshblack <3901764+joshblack@users.noreply.github.com>

Copilot

Pull Request Overview

This PR adds support for the merge queue feature to the status-checks workflow. When a PR with the label "integration-tests: skipped manually" enters the merge queue, this workflow will automatically override the required status checks.

Key Changes

Added merge_group event trigger to allow the workflow to run during merge queue operations
Updated job-level conditional to run for both labeled pull requests and all merge queue events
Split the status check override logic into separate steps for pull requests and merge queue with appropriate conditionals

Copilot · 2025-11-10T17:05:30Z

.github/workflows/status-checks.yml

+  merge_group:
+    branches:
+      - main
+    types: [checks_requested]


[nitpick] The types array uses bracket notation [checks_requested] while other workflows in the repository (ci.yml and reports.yml) use flow sequence notation - checks_requested for consistency. Consider changing to flow sequence notation to match the project's style.

Suggested change

types: [checks_requested]

types:

- checks_requested

siddharthkp

I don't fully understand this, but happy to follow your lead on this!

Initial plan

5e70038

Copilot AI assigned Copilot and joshblack Nov 7, 2025

Copilot started work on behalf of joshblack November 7, 2025 17:51 View session

Copilot AI and others added 4 commits November 7, 2025 17:59

Add merge_group trigger support to status-checks workflow

9b19bc8

Co-authored-by: joshblack <3901764+joshblack@users.noreply.github.com>

Add branches filter to merge_group trigger for consistency

8106a23

Co-authored-by: joshblack <3901764+joshblack@users.noreply.github.com>

Add validation for PR number extraction in merge_group events

69388aa

Co-authored-by: joshblack <3901764+joshblack@users.noreply.github.com>

Improve code quality: add parentheses, better regex, and use github.r…

0146352

…epository Co-authored-by: joshblack <3901764+joshblack@users.noreply.github.com>

Copilot AI changed the title ~~[WIP] Update status-checks.yml for merge queue trigger~~ Add merge_group trigger support to status-checks workflow Nov 7, 2025

Copilot AI requested a review from joshblack November 7, 2025 18:06

Copilot finished work on behalf of joshblack November 7, 2025 18:06

joshblack reviewed Nov 7, 2025

View reviewed changes

Copilot started work on behalf of joshblack November 7, 2025 18:10 View session

Split into separate jobs for pull_request and merge_group

8c0dbfa

Co-authored-by: joshblack <3901764+joshblack@users.noreply.github.com>

joshblack reviewed Nov 7, 2025

View reviewed changes

Copilot AI requested a review from joshblack November 7, 2025 18:18

Copilot finished work on behalf of joshblack November 7, 2025 18:18

Copilot started work on behalf of joshblack November 7, 2025 18:18 View session

Combine into single job with conditional steps

59048df

Co-authored-by: joshblack <3901764+joshblack@users.noreply.github.com>

Copilot finished work on behalf of joshblack November 7, 2025 18:25

joshblack reviewed Nov 7, 2025

View reviewed changes

Copilot started work on behalf of joshblack November 7, 2025 18:32 View session

Refactor to use env variables and remove label check for merge queue

f71e44b

Co-authored-by: joshblack <3901764+joshblack@users.noreply.github.com>

Copilot AI requested a review from joshblack November 7, 2025 18:38

Copilot finished work on behalf of joshblack November 7, 2025 18:38

Remove PR details from merge group job

a453468

joshblack marked this pull request as ready for review November 10, 2025 17:03

joshblack requested a review from a team as a code owner November 10, 2025 17:03

Copilot AI review requested due to automatic review settings November 10, 2025 17:03

joshblack added the skip changeset This change does not need a changelog label Nov 10, 2025

Merge branch 'main' into copilot/update-status-checks-workflow

0539ce9

Copilot AI reviewed Nov 10, 2025

View reviewed changes

github-actions bot requested a deployment to storybook-preview-7163 November 10, 2025 17:08 Abandoned

joshblack deployed to github-pages November 10, 2025 17:16 — with GitHub Actions View deployment

github-actions bot deployed to storybook-preview-7163 November 10, 2025 17:17 View deployment

joshblack approved these changes Nov 10, 2025

View reviewed changes

joshblack requested a review from siddharthkp November 10, 2025 17:26

siddharthkp approved these changes Nov 12, 2025

View reviewed changes

Add merge_group trigger support to status-checks workflow #7163

Are you sure you want to change the base?

Add merge_group trigger support to status-checks workflow #7163

Uh oh!

Conversation

Copilot AI commented Nov 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changelog

Changed

Rollout strategy

Testing & Reviewing

Merge checklist

Uh oh!

changeset-bot bot commented Nov 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

⚠️ No Changeset found

Uh oh!

joshblack left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI commented Nov 7, 2025

Uh oh!

joshblack left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI commented Nov 7, 2025

Uh oh!

joshblack Nov 7, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 7, 2025

Choose a reason for hiding this comment

Uh oh!

joshblack Nov 7, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 7, 2025

Choose a reason for hiding this comment

Uh oh!

joshblack Nov 7, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 7, 2025

Choose a reason for hiding this comment

Uh oh!

joshblack Nov 7, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 7, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Key Changes

Uh oh!

Copilot AI Nov 10, 2025

Choose a reason for hiding this comment

Uh oh!

siddharthkp left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Copilot AI commented Nov 7, 2025 •

edited

Loading

changeset-bot bot commented Nov 7, 2025 •

edited

Loading