Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CP] Generated Plugin Registrant Null Safety Fix #109906

Conversation

MatthewPatience
Copy link

Cherry pick to add this severe issue fix to the current beta build that is causing all web builds without null safety to fail when targeting the beta branch.

#109160

@flutter-dashboard
Copy link

This pull request was opened against a branch other than master. Since Flutter pull requests should not normally be opened against branches other than master, I have changed the base to master. If this was intended, you may modify the base back to flutter-3.2-candidate.5. See the Release Process for information about how other branches get updated.

Reviewers: Use caution before merging pull requests to branches other than master, unless this is an intentional hotfix/cherrypick.

@flutter-dashboard flutter-dashboard bot changed the base branch from flutter-3.2-candidate.5 to master August 20, 2022 04:29
@flutter-dashboard flutter-dashboard bot added engine flutter/engine repository. See also e: labels. framework flutter/packages/flutter repository. See also f: labels. tool Affects the "flutter" command-line tool. See also t: labels. labels Aug 20, 2022
@MatthewPatience MatthewPatience changed the base branch from master to flutter-3.2-candidate.5 August 20, 2022 04:31
@goderbauer goderbauer removed the framework flutter/packages/flutter repository. See also f: labels. label Aug 23, 2022
@christopherfujino
Copy link
Member

CP request at #109905

@MatthewPatience
Copy link
Author

I believe candidate 5 was released, should this be targeted at a different branch now?

@christopherfujino
Copy link
Member

I believe candidate 5 was released, should this be targeted at a different branch now?

No, all hotfix releases go on the same branch. candidate 5 means the 5th (actually 6th, since it's 0-indexed) candidate branch point from master that could become a release.

@CaseyHillers
Copy link
Contributor

@MatthewPatience can you rebase this PR with the upstream branch? It seems to be missing a CP that is causing the tests to fail.

@MatthewPatience
Copy link
Author

MatthewPatience commented Aug 29, 2022

@CaseyHillers I checked and I don't see anything to be pulled in from the upstream branch.

I actually did merge in the latest a couple days ago and that is what caused the tests to start failing. Checking some other PR's I see they have the same tests failing.

@christopherfujino
Copy link
Member

@CaseyHillers I checked and I don't see anything to be pulled in from the upstream branch.

I actually did merge in the latest a couple days ago and that is what caused the tests to start failing. Checking some other PR's I see they have the same tests failing.

You're missing the 3 newest commits from https://github.com/flutter/flutter/commits/flutter-3.2-candidate.5. Make sure you're fetching from the correct remote before merging.

Copy link
Contributor

@yjbanov yjbanov left a comment

Choose a reason for hiding this comment

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

lgtm

@christopherfujino
Copy link
Member

@CaseyHillers I checked and I don't see anything to be pulled in from the upstream branch.
I actually did merge in the latest a couple days ago and that is what caused the tests to start failing. Checking some other PR's I see they have the same tests failing.

You're missing the 3 newest commits from https://github.com/flutter/flutter/commits/flutter-3.2-candidate.5. Make sure you're fetching from the correct remote before merging.

Oops, never mind, I think I read the git log wrong, this looks up to date to me.

@MatthewPatience
Copy link
Author

Ah ok, I don't need to pull my hair out then! Is someone able to merge this, it's quite important to us!

@CaseyHillers
Copy link
Contributor

FYI I filed #110531 as these failures aren't related to your PR. That issue should get fixed today, and I'll ensure this get submitted.

@CaseyHillers CaseyHillers self-assigned this Aug 29, 2022
@CaseyHillers CaseyHillers merged commit 76f5ff5 into flutter:flutter-3.2-candidate.5 Aug 29, 2022
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 30, 2022
engine-flutter-autoroll added a commit to engine-flutter-autoroll/plugins that referenced this pull request Aug 30, 2022
@eyebrowsoffire
Copy link
Contributor

Thank you for taking care of this cherry pick @MatthewPatience!

@MatthewPatience
Copy link
Author

No worries, it was quite important to us, thanks to you for continuing to develop Flutter!

@MatthewPatience MatthewPatience deleted the cp-plugin-registrant-null-safety branch August 30, 2022 20:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
engine flutter/engine repository. See also e: labels. tool Affects the "flutter" command-line tool. See also t: labels.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants