Skip to content

Add agent skills for orchestrating cherry-picks to stable and beta channels#187860

Merged
auto-submit[bot] merged 11 commits into
flutter:masterfrom
bkonyi:add-cherry-pick-skills
Jun 22, 2026
Merged

Add agent skills for orchestrating cherry-picks to stable and beta channels#187860
auto-submit[bot] merged 11 commits into
flutter:masterfrom
bkonyi:add-cherry-pick-skills

Conversation

@bkonyi

@bkonyi bkonyi commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

This PR adds the flutter-cp-stable, flutter-cp-beta, and flutter-cp-common agent skills to the repository under .agents/skills/. These skills automate the process of cherry-picking merged PRs to the stable and beta branches, including conflict resolution and template filling.

@bkonyi bkonyi requested a review from reidbaker as a code owner June 11, 2026 15:30
@flutter-dashboard flutter-dashboard Bot added the CICD Run CI/CD label Jun 11, 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 introduces automated cherry-pick workflows for the beta and stable channels, along with a Dart helper script to orchestrate the process. Feedback points out a bug in the conflict parsing logic that can miss certain unmerged files, a hardcoded absolute path in the skill definition, and the need to dynamically detect the git remote to support fork-based workflows.

Comment thread .agents/skills/flutter-cp-common/scripts/flutter_cp.dart Outdated
Comment thread .agents/skills/flutter-cp-common/SKILL.md Outdated
Comment thread .agents/skills/flutter-cherry-pick/scripts/flutter_cp.dart
Comment thread .agents/skills/flutter-cherry-pick/scripts/flutter_cp.dart
@github-actions github-actions Bot removed the CICD Run CI/CD label Jun 11, 2026
@flutter-dashboard flutter-dashboard Bot added the CICD Run CI/CD label Jun 11, 2026
@github-actions github-actions Bot removed the CICD Run CI/CD label Jun 11, 2026
@flutter-dashboard flutter-dashboard Bot added the CICD Run CI/CD label Jun 11, 2026
@github-actions github-actions Bot removed the CICD Run CI/CD label Jun 11, 2026
Comment thread .agents/skills/flutter-cp-beta/SKILL.md Outdated
@flutter-dashboard flutter-dashboard Bot added the CICD Run CI/CD label Jun 12, 2026
@github-actions github-actions Bot removed the CICD Run CI/CD label Jun 12, 2026
@bkonyi bkonyi added the CICD Run CI/CD label Jun 12, 2026
Comment thread .agents/skills/flutter-cherry-pick/SKILL.md Outdated
Comment thread .agents/skills/flutter-cherry-pick/SKILL.md
Comment thread .agents/skills/flutter-cherry-pick/SKILL.md
Comment thread .agents/skills/flutter-cherry-pick/SKILL.md
Comment thread .agents/skills/flutter-cherry-pick/SKILL.md Outdated
Comment thread .agents/skills/flutter-cherry-pick/SKILL.md Outdated
Comment thread .agents/skills/flutter-cherry-pick/SKILL.md Outdated
Comment thread .agents/skills/flutter-cherry-pick/SKILL.md Outdated
Comment thread .agents/skills/flutter-cherry-pick/SKILL.md Outdated
Comment thread .agents/skills/flutter-cherry-pick/SKILL.md
- Add bounds and constraints section to `SKILL.md`.
- Remove redundant introductory title and paragraph.
- Add git environment cleanliness check to Phase 1.
- Add conflict documentation instructions to Phase 3.
- Remove specific tool name references to make instructions tool-agnostic.
- Update fallback logic for logic-impacting conflicts.
- Use markdown link for local template to support linting.
- Remove remote template fallback.
- Add concrete examples of drafting template text and checkbox sections.
@bkonyi bkonyi requested a review from reidbaker June 19, 2026 20:16
@github-actions github-actions Bot removed the CICD Run CI/CD label Jun 19, 2026
…flutter_cp.dart`

- Remove `// ignore_for_file` directive to expose all lints.
- Define `_info` (stdout) and `_error` (stderr) helper functions to replace `print` calls, resolving `avoid_print` and improving I/O separation.
- Add explicit `<void>` type arguments to `Future.delayed` calls.
- Wrap one-liner control flow statements in braces and format them.
- Refactor conflicted files loop to use `forEach` with a tear-off.
- Run `dart fix` to resolve mechanical lints (prefer_final_locals, omit_obvious_local_variable_types, etc.).
- Format code using `dart format`.
@flutter-dashboard flutter-dashboard Bot added the CICD Run CI/CD label Jun 19, 2026
@bkonyi bkonyi added the autosubmit Merge PR when tree becomes green via auto submit App label Jun 22, 2026
@auto-submit

auto-submit Bot commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

autosubmit label was removed for flutter/flutter/187860, because The base commit of the PR is older than 7 days and can not be merged. Please merge the latest changes from the main into this branch and resubmit the PR.

@auto-submit auto-submit Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Jun 22, 2026
@github-actions github-actions Bot removed the CICD Run CI/CD label Jun 22, 2026
@bkonyi bkonyi added autosubmit Merge PR when tree becomes green via auto submit App CICD Run CI/CD labels Jun 22, 2026
@auto-submit auto-submit Bot added this pull request to the merge queue Jun 22, 2026
Merged via the queue into flutter:master with commit 8bc1f30 Jun 22, 2026
62 checks passed
@flutter-dashboard flutter-dashboard Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Jun 22, 2026
auto-submit Bot pushed a commit to flutter/packages that referenced this pull request Jun 23, 2026
flutter/flutter@e228771...87224e0

2026-06-23 engine-flutter-autoroll@skia.org Roll Dart SDK from 5cae7f9ada62 to 3a66ea7b9aaa (1 revision) (flutter/flutter#188379)
2026-06-23 engine-flutter-autoroll@skia.org Roll Dart SDK from 1e6c246bb73a to 5cae7f9ada62 (2 revisions) (flutter/flutter#188370)
2026-06-23 engine-flutter-autoroll@skia.org Roll Skia from 766f21ae61dc to ffac3e91fbc7 (24 revisions) (flutter/flutter#188366)
2026-06-23 737941+loic-sharma@users.noreply.github.com [Windows] Add public API to post task to platform thread (flutter/flutter#187365)
2026-06-23 engine-flutter-autoroll@skia.org Roll Dart SDK from 7ab0179ce4d4 to 1e6c246bb73a (1 revision) (flutter/flutter#188354)
2026-06-23 robert.ancell@canonical.com Fix byte/character offset confusion in FlAccessibleTextField (flutter/flutter#188138)
2026-06-22 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from Lm76V7lvxVA0r1De5... to RymJjIj7dd5vQ3Cnh... (flutter/flutter#188353)
2026-06-22 137456488+flutter-pub-roller-bot@users.noreply.github.com Roll pub packages (flutter/flutter#188355)
2026-06-22 154381524+flutteractionsbot@users.noreply.github.com Sync CHANGELOG.md from stable (flutter/flutter#188331)
2026-06-22 engine-flutter-autoroll@skia.org Roll Skia from 5fbb9bbd889c to 766f21ae61dc (2 revisions) (flutter/flutter#188184)
2026-06-22 49699333+dependabot[bot]@users.noreply.github.com Bump actions/checkout from 6.0.3 to 7.0.0 in the all-github-actions group (flutter/flutter#188350)
2026-06-22 robert.ancell@canonical.com Use g_signal_connect_object in the Linux embedder (flutter/flutter#188241)
2026-06-22 robert.ancell@canonical.com Disconnect from parent window signal when view is destroyed (flutter/flutter#185521)
2026-06-22 rmacnak@google.com Remove many absolute paths from build commands. (flutter/flutter#187765)
2026-06-22 haiderqadir.hq@gmail.com Fix spelling mistake in documentation (wether → whether) (flutter/flutter#186141)
2026-06-22 engine-flutter-autoroll@skia.org Roll Dart SDK from a748c4b15399 to 7ab0179ce4d4 (2 revisions) (flutter/flutter#188332)
2026-06-22 robert.ancell@canonical.com [Linux] Move compositor shader into its own GObject (flutter/flutter#188144)
2026-06-22 bkonyi@google.com Add agent skills for orchestrating cherry-picks to stable and beta channels (flutter/flutter#187860)
2026-06-22 engine-flutter-autoroll@skia.org Roll Packages from c516c92 to cd5194a (1 revision) (flutter/flutter#188312)

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 stuartmorgan@google.com 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
via-guy pushed a commit to via-guy/flutter that referenced this pull request Jun 26, 2026
…annels (flutter#187860)

This PR adds the flutter-cp-stable, flutter-cp-beta, and
flutter-cp-common agent skills to the repository under .agents/skills/.
These skills automate the process of cherry-picking merged PRs to the
stable and beta branches, including conflict resolution and template
filling.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CICD Run CI/CD

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants