Skip to content

[cherry-pick] Allow cherry-pick bot PRs in engineering system changes check#311505

Merged
benvillalobos merged 1 commit intorelease/1.117from
cherry-pick/311475
Apr 20, 2026
Merged

[cherry-pick] Allow cherry-pick bot PRs in engineering system changes check#311505
benvillalobos merged 1 commit intorelease/1.117from
cherry-pick/311475

Conversation

@benvillalobos
Copy link
Copy Markdown
Member

Cherry-pick of #311475 into release/1.117.

* 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.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* 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.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* 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>

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@benvillalobos benvillalobos enabled auto-merge (squash) April 20, 2026 21:58
@benvillalobos benvillalobos merged commit fb8b7a3 into release/1.117 Apr 20, 2026
26 checks passed
@benvillalobos benvillalobos deleted the cherry-pick/311475 branch April 20, 2026 22:19
@vs-code-engineering vs-code-engineering bot added this to the 1.117.0 milestone Apr 20, 2026
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.

2 participants