Skip to content

Fix space formatting in cherry-pick label for flutter_cp.dart - #189463

Merged
auto-submit[bot] merged 3 commits into
flutter:masterfrom
bkonyi:fix-cherry-pick-label
Jul 14, 2026
Merged

auto-submit[bot] merged 3 commits into
flutter:masterfrom
bkonyi:fix-cherry-pick-label

Conversation

@bkonyi

@bkonyi bkonyi commented Jul 14, 2026

Copy link
Copy Markdown
Contributor

Fixes the label formatting in flutter_cp.dart so that gh api adds 'cp: ' instead of creating a new label without a space.

@bkonyi
bkonyi requested a review from reidbaker as a code owner July 14, 2026 18:47
@flutter-dashboard flutter-dashboard Bot added the CICD Run CI/CD label Jul 14, 2026
@flutter-dashboard

Copy link
Copy Markdown

It looks like this pull request may not have tests. Please make sure to add tests or get an explicit test exemption before merging.

If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix?

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing. If you believe this PR qualifies for a test exemption, contact "@test-exemption-reviewer" in the #hackers channel in Discord (don't just cc them here, they won't see it!). The test exemption team is a small volunteer group, so all reviewers should feel empowered to ask for tests, without delegating that responsibility entirely to the test exemption group.

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request updates the label format in the flutter_cp.dart script by adding a space after the colon in the cherry-pick label (changing cp:$channel to cp: $channel). There are no review comments, and I have no feedback to provide.

@bkonyi
bkonyi requested a review from gmackall July 14, 2026 18:48
gmackall
gmackall previously approved these changes Jul 14, 2026

@gmackall gmackall left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, though based on
https://discord.com/channels/608014603317936148/610574672865656952/1526611428050735217
perhaps we could pare the scope down further and instead somehow not expose arbitrary label adding but instead have dart
addCpStableLabel
and
addCpBetaLabel
which have the channel pre-filled? So it only can mechanically choose between the two options

but anyways this seems like an improvement, so lgtm - if gets confused on channel in the future perhaps the above would help

@bkonyi

bkonyi commented Jul 14, 2026 •

Copy link
Copy Markdown
Contributor Author

Updated addLabel() and CLI parameter validation in flutter_cp.dart to strictly validate channel (stable or beta) and explicitly map to 'cp: stable' or 'cp: beta', throwing an ArgumentError on any invalid input to prevent creating arbitrary labels.

@gmackall gmackall left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm!

@bkonyi bkonyi added the autosubmit Merge PR when tree becomes green via auto submit App label Jul 14, 2026
@auto-submit
auto-submit Bot added this pull request to the merge queue Jul 14, 2026
Merged via the queue into flutter:master with commit 66a3750 Jul 14, 2026
59 of 60 checks passed
@flutter-dashboard flutter-dashboard Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Jul 14, 2026
auto-submit Bot pushed a commit to flutter/packages that referenced this pull request Jul 15, 2026
flutter/flutter@846664b...fc1ad95

2026-07-15 [email protected] [iOS] Migrate FlutterKeyboardInsetManager to Swift (flutter/flutter#189425)
2026-07-15 [email protected] Roll Dart SDK from 05bf153370c4 to 0c408ff6dce9 (4 revisions) (flutter/flutter#189487)
2026-07-15 [email protected] Implement UberSDF lines to replace LineContents-based AA lines (flutter/flutter#188514)
2026-07-15 [email protected] Fix stale eagerWinner reference in GestureArenaManager when rejected before arena close (flutter/flutter#187008)
2026-07-15 [email protected] Disable some Windows tests that are flaking on CI (flutter/flutter#189477)
2026-07-15 dmgr Added unified check-run user manual (flutter/flutter#189453)
2026-07-15 [email protected] Roll Skia from 88954ef8f36d to ab2410bc857c (9 revisions) (flutter/flutter#189474)
2026-07-14 [email protected] [agents] Refactor shepherd-prs skill into a pure Markdown runbook using native gh CLI (flutter/flutter#189095)
2026-07-14 [email protected] Add missing name to mirroring workflow (flutter/flutter#189439)
2026-07-14 [email protected] Add support for WASM deferred loading. (flutter/flutter#189308)
2026-07-14 [email protected] fix `templateDefaultGradleVersion` todo (flutter/flutter#189466)
2026-07-14 [email protected] Roll Fuchsia Linux SDK from oOETA0ISPouDt2xBo... to lLFbh5kFWbUGgC9Ek... (flutter/flutter#189469)
2026-07-14 [email protected] Use ServicesBinding.instance.exitApplication instead of exit(0) in multiple_windows example (flutter/flutter#189364)
2026-07-14 [email protected] Add CpuArch to the Device class (flutter/flutter#189207)
2026-07-14 [email protected] Fix space formatting in cherry-pick label for flutter_cp.dart (flutter/flutter#189463)
2026-07-14 [email protected] Roll pub packages (flutter/flutter#189454)
2026-07-14 [email protected] [flutter_tools] Format plugin example template to match dart format (flutter/flutter#188382)
2026-07-14 [email protected] Move renamed x64->ARM benchmarks out of bringup (flutter/flutter#189400)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-packages
Please CC [email protected],[email protected] on the revert to ensure that a human
is aware of the problem.

To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
@bkonyi bkonyi added the cp: stable cherry pick this pull request to stable release candidate branch label Aug 14, 2026
auto-submit Bot pushed a commit that referenced this pull request Aug 14, 2026
#191123)

This pull request is created by [automatic cherry pick workflow](https://github.com/flutter/flutter/blob/main/docs/releases/Flutter-Cherrypick-Process.md#automatically-creates-a-cherry-pick-request)
Please fill in the form below, and a flutter domain expert will evaluate this cherry pick request.

### Issue Link:
What is the link to the issue this cherry-pick is addressing?

N/A (Fixes cherry-pick helper script bug from #189463)

### Impact Description:
What is the impact (ex. visual jank on Samsung phones, app crash, cannot ship an iOS app)?
Does it impact development (ex. flutter doctor crashes when Android Studio is installed),
or the shipping of production apps (the app crashes on launch).
This information is for domain experts and release engineers to understand the consequences of saying yes or no to the cherry pick.

When running the cherry-pick agent helper script (`flutter_cp.dart`) on a release branch, the script adds unspaced label arguments (`cp:stable` or `cp:beta`) instead of `cp: stable` or `cp: beta`. This results in creating unintended, duplicate repository labels.

### Changelog Description:
Explain this cherry pick:
* In one line that is accessible to most Flutter developers.
* That describes the state prior to the fix.
* That includes which platforms are impacted.
See [best practices](https://github.com/flutter/flutter/blob/main/docs/releases/Hotfix-Documentation-Best-Practices.md) for examples.

[flutter/189463] When running the cherry-pick helper script, incorrect label argument formatting causes unintended repository label creation.

### Workaround:
Is there a workaround for this issue?

Manually add the correct channel label (`cp: stable` or `cp: beta`) with a space via GitHub UI/CLI, and remove the unspaced label.

### Risk:
What is the risk level of this cherry-pick?

### Test Coverage:
Are you confident that your fix is well-tested by automated tests?

### Validation Steps:
What are the steps to validate that this fix works?

1. Run `dart .agents/skills/flutter-cherry-pick/scripts/flutter_cp.dart --pr <PR> --channel stable --action start`.
2. Verify that `cp: stable` (with space) is added to the PR and no duplicate unspaced label is created.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CICD Run CI/CD cp: stable cherry pick this pull request to stable release candidate branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants