Skip to content

[CP-stable] Fix changelog merging workflow.#185095

Merged
auto-submit[bot] merged 1 commit into
flutter:flutter-3.41-candidate.0from
eyebrowsoffire:cp_merge_changelog
Apr 15, 2026
Merged

[CP-stable] Fix changelog merging workflow.#185095
auto-submit[bot] merged 1 commit into
flutter:flutter-3.41-candidate.0from
eyebrowsoffire:cp_merge_changelog

Conversation

@eyebrowsoffire

@eyebrowsoffire eyebrowsoffire commented Apr 15, 2026

Copy link
Copy Markdown
Contributor

This change also pulls some changelogs from 3.38 which happened after 3.41's original branch cut.

The changes to the workflow are from this PR: #184145

This change also pulls some changelogs from 3.38 which happened after
3.41's original branch cut.
@eyebrowsoffire eyebrowsoffire added cp: review Cherry-picks in the review queue cp: merge-to-stable Cherry-picks that should be merged to stable labels Apr 15, 2026
@flutter-dashboard

Copy link
Copy Markdown

This pull request was opened from and to a release candidate branch. This should only be done as part of the official Flutter release process. If you are attempting to make a regular contribution to the Flutter project, please close this PR and follow the instructions at Tree Hygiene for detailed instructions on contributing to Flutter.

Reviewers: Use caution before merging pull requests to release branches. Ensure the proper procedure has been followed.

@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 CHANGELOG.md with entries for Flutter versions 3.38.6 through 3.38.10. Feedback includes correcting a version typo from 'iOS 26' to 'iOS 16', removing an unnecessary newline for consistent spacing, and standardizing the entry format by removing hyphens after issue links.

Comment thread CHANGELOG.md
Comment thread CHANGELOG.md
Comment thread CHANGELOG.md
Comment thread CHANGELOG.md
@eyebrowsoffire eyebrowsoffire added the CICD Run CI/CD label Apr 15, 2026

@camsim99 camsim99 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.

Makes sense to me!

@reidbaker reidbaker 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.

If this is a cherry pick of the workflow can you include the commit hash being cherry picked or the pr in the pr description.

I do not think that changelog entries should be cherry picked into 3.41 and if they were it should not happen in a workflow pr to help with releasing.

@eyebrowsoffire

Copy link
Copy Markdown
Contributor Author

If this is a cherry pick of the workflow can you include the commit hash being cherry picked or the pr in the pr description.

I do not think that changelog entries should be cherry picked into 3.41 and if they were it should not happen in a workflow pr to help with releasing.

I added a link in the description to the PR that originally fixed the workflow on master. (#184145)

We actually must cherry-pick the 3.38 changelog entries into 3.41, otherwise when the merge changelog workflow runs, it will actually delete these 3.38 changelog entries from the master branch, which is definitely not something we want to do.

@reidbaker reidbaker 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.

Unblocking but having to have updated changelogs is a new constraint. Our processes do not sync changelogs across long running branches.

@eyebrowsoffire eyebrowsoffire added the autosubmit Merge PR when tree becomes green via auto submit App label Apr 15, 2026
@auto-submit auto-submit Bot merged commit c7cfd95 into flutter:flutter-3.41-candidate.0 Apr 15, 2026
9 checks passed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 16, 2026
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 17, 2026
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 17, 2026
Xbectordash pushed a commit to Xbectordash/abhi_flutter_fork that referenced this pull request May 13, 2026
This change also pulls some changelogs from 3.38 which happened after 3.41's original branch cut.

The changes to the workflow are from this PR: flutter#184145
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

autosubmit Merge PR when tree becomes green via auto submit App CICD Run CI/CD cp: merge-to-stable Cherry-picks that should be merged to stable cp: review Cherry-picks in the review queue

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants