Allow cherry-pick bot PRs in engineering system changes check#311475
Merged
benvillalobos merged 4 commits intomainfrom Apr 20, 2026
Merged
Allow cherry-pick bot PRs in engineering system changes check#311475benvillalobos merged 4 commits intomainfrom
benvillalobos merged 4 commits intomainfrom
Conversation
Add an exception for PRs created by vs-code-engineering[bot] whose title starts with [cherry-pick] and that carry the cherry-pick-artifact label. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Contributor
Screenshot ChangesBase: Changed (1)
|
| Before | After |
|---|---|
 |
 |
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the “Prevent engineering system changes in PRs” GitHub Actions workflow to permit a narrowly-scoped exception for cherry-pick PRs opened by vs-code-engineering[bot], so that automation can cherry-pick changes that touch protected engineering-system files.
Changes:
- Adds a new “cherry-pick bot PR” exception gate requiring author =
vs-code-engineering[bot], title prefix =[cherry-pick], and label =cherry-pick-artifact. - Updates downstream guard steps to honor the new exception (skip blocking/permission checks when it applies).
Show a summary per file
| File | Description |
|---|---|
| .github/workflows/no-engineering-system-changes.yml | Introduces a cherry-pick exception step and threads it through the subsequent enforcement conditions. |
Copilot's findings
- Files reviewed: 1/1 changed files
- Comments generated: 1
The label is applied ~2s after PR creation, so the webhook payload may not include it. Fetch current labels from the API instead, gated behind cheap event-payload checks to avoid extra API calls on unrelated PRs. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Retry the cherry-pick-artifact label check up to 3 times (2s apart) to handle the ~2s delay between PR creation and label application. Consolidate the repeated exception guards into a single 'allowed' step with a 'blocked' output, simplifying downstream conditions. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
mjbvz
approved these changes
Apr 20, 2026
vijayupadya
approved these changes
Apr 20, 2026
benvillalobos
deleted the
agents/update-no-engineering-check-cherry-pick
branch
benvillalobos
added a commit
that referenced
this pull request
Apr 20, 2026
… check (#311505) Allow cherry-pick bot PRs in engineering system changes check (#311475) * Allow cherry-pick bot PRs in engineering system changes check Add an exception for PRs created by vs-code-engineering[bot] whose title starts with [cherry-pick] and that carry the cherry-pick-artifact label. * Fetch cherry-pick-artifact label via API at runtime The label is applied ~2s after PR creation, so the webhook payload may not include it. Fetch current labels from the API instead, gated behind cheap event-payload checks to avoid extra API calls on unrelated PRs. * Add label retry loop and consolidate guard expressions Retry the cherry-pick-artifact label check up to 3 times (2s apart) to handle the ~2s delay between PR creation and label application. Consolidate the repeated exception guards into a single 'allowed' step with a 'blocked' output, simplifying downstream conditions. --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Add an exception to the "Prevent engineering system changes in PRs" workflow for cherry-pick PRs created by
vs-code-engineering[bot].A PR is allowed through when all three conditions are met:
vs-code-engineering[bot][cherry-pick]cherry-pick-artifactlabelAll downstream guard steps are updated to also check this new exception.