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.

Sign up for GitHub

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

Jump to bottom

Manual revert of #53001 #53075

Merged
merged 1 commit into from
May 28, 2024
Merged

Manual revert of #53001 #53075

merged 1 commit into from
May 28, 2024

Conversation

gmackall
Copy link
Member

@gmackall gmackall commented May 28, 2024 •
edited
Loading

Revert label failed due to conflicts

FlutterFragmentTest.java was the only file that had merge issues, everything else is the output of git revert 00e72e9cecb138e001f5625ff67a370aabd3e3c5

Pre-launch Checklist

  • I read the Contributor Guide and followed the process outlined there for submitting PRs.
  • I read the Tree Hygiene wiki page, which explains my responsibilities.
  • I read and followed the Flutter Style Guide and the C++, Objective-C, Java style guides.
  • I listed at least one issue that this PR fixes in the description above.
  • I added new tests to check the change I am making or feature I am adding, or the PR is test-exempt. See testing the engine for instructions on writing and running engine tests.
  • I updated/added relevant documentation (doc comments with ///).
  • I signed the CLA.
  • All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

@gmackall gmackall marked this pull request as ready for review May 28, 2024 22:05
@gmackall gmackall changed the title Manual revert of https://github.com/flutter/engine/pull/53001 Manual revert of #53001 May 28, 2024
@gmackall gmackall requested review from eyebrowsoffire and a team May 28, 2024 22:06
@gmackall gmackall mentioned this pull request May 28, 2024
Closed
@gmackall gmackall added the autosubmit Merge PR when tree becomes green via auto submit App label May 28, 2024
eyebrowsoffire
eyebrowsoffire approved these changes May 28, 2024
View reviewed changes
Copy link
Contributor

@eyebrowsoffire eyebrowsoffire left a comment

Choose a reason for hiding this comment

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

LGTM

@auto-submit auto-submit bot merged commit b26e1b0 into flutter:main May 28, 2024
33 checks passed
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request May 29, 2024
Merged
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 29, 2024
@engine-flutter-autoroll
b26e1b023 Manual revert of flutter#53001 (flutter/engine#53075)
ac3ae3c
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request May 29, 2024
@engine-flutter-autoroll
Manual roll Flutter Engine from d0323905fc2f to b26e1b023cdb (16 revi…
35ae519 
…sions) (#149220)

Manual roll requested by [email protected]

flutter/engine@d032390...b26e1b0

2024-05-28 [email protected] Manual revert of #53001 (flutter/engine#53075)
2024-05-28 [email protected] Remove --ios-cpu flag. Only the arm64 variant is supported. (flutter/engine#53044)
2024-05-28 [email protected] Roll Skia from 229d94a8807e to ac454b80130c (1 revision) (flutter/engine#53074)
2024-05-28 [email protected] [Impeller] make strokes slightly lighter. (flutter/engine#53067)
2024-05-28 [email protected] Roll Skia from 23ddbb590e44 to 229d94a8807e (2 revisions) (flutter/engine#53071)
2024-05-28 [email protected] FlutterFragment predictive back (flutter/engine#52302)
2024-05-28 [email protected] Roll Skia from 02c359cf8233 to 23ddbb590e44 (2 revisions) (flutter/engine#53070)
2024-05-28 [email protected] Roll Skia from 4f91b3865441 to 02c359cf8233 (1 revision) (flutter/engine#53069)
2024-05-28 [email protected] [Impeller] shrunk the buffer for the rrect_blur (flutter/engine#53068)
2024-05-28 [email protected] Roll Skia from 91cd2b48377a to 4f91b3865441 (4 revisions) (flutter/engine#53066)
2024-05-28 [email protected] Upgrade all[most] androidx dependencies to latest (flutter/engine#53001)
2024-05-28 [email protected] Roll Skia from 0c2c490021b7 to 91cd2b48377a (3 revisions) (flutter/engine#53065)
2024-05-28 [email protected] Roll Skia from 545203f95d4e to 0c2c490021b7 (2 revisions) (flutter/engine#53063)
2024-05-28 [email protected] Roll Skia from 74b4d97be6ab to 545203f95d4e (1 revision) (flutter/engine#53062)
2024-05-28 [email protected] Roll Skia from 848d9498fd68 to 74b4d97be6ab (1 revision) (flutter/engine#53061)
2024-05-28 [email protected] Remove use of --nnbd-agnostic (flutter/engine#53055)

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

To file a bug in Flutter: 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
victorsanni pushed a commit to victorsanni/flutter that referenced this pull request May 31, 2024
@engine-flutter-autoroll @victorsanni
Manual roll Flutter Engine from d0323905fc2f to b26e1b023cdb (16 revi…
d61fd34 
…sions) (flutter#149220)

Manual roll requested by [email protected]

flutter/engine@d032390...b26e1b0

2024-05-28 [email protected] Manual revert of flutter#53001 (flutter/engine#53075)
2024-05-28 [email protected] Remove --ios-cpu flag. Only the arm64 variant is supported. (flutter/engine#53044)
2024-05-28 [email protected] Roll Skia from 229d94a8807e to ac454b80130c (1 revision) (flutter/engine#53074)
2024-05-28 [email protected] [Impeller] make strokes slightly lighter. (flutter/engine#53067)
2024-05-28 [email protected] Roll Skia from 23ddbb590e44 to 229d94a8807e (2 revisions) (flutter/engine#53071)
2024-05-28 [email protected] FlutterFragment predictive back (flutter/engine#52302)
2024-05-28 [email protected] Roll Skia from 02c359cf8233 to 23ddbb590e44 (2 revisions) (flutter/engine#53070)
2024-05-28 [email protected] Roll Skia from 4f91b3865441 to 02c359cf8233 (1 revision) (flutter/engine#53069)
2024-05-28 [email protected] [Impeller] shrunk the buffer for the rrect_blur (flutter/engine#53068)
2024-05-28 [email protected] Roll Skia from 91cd2b48377a to 4f91b3865441 (4 revisions) (flutter/engine#53066)
2024-05-28 [email protected] Upgrade all[most] androidx dependencies to latest (flutter/engine#53001)
2024-05-28 [email protected] Roll Skia from 0c2c490021b7 to 91cd2b48377a (3 revisions) (flutter/engine#53065)
2024-05-28 [email protected] Roll Skia from 545203f95d4e to 0c2c490021b7 (2 revisions) (flutter/engine#53063)
2024-05-28 [email protected] Roll Skia from 74b4d97be6ab to 545203f95d4e (1 revision) (flutter/engine#53062)
2024-05-28 [email protected] Roll Skia from 848d9498fd68 to 74b4d97be6ab (1 revision) (flutter/engine#53061)
2024-05-28 [email protected] Remove use of --nnbd-agnostic (flutter/engine#53055)

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

To file a bug in Flutter: 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
gmackall pushed a commit to gmackall/engine that referenced this pull request Jun 18, 2024
Revert "Manual revert of flutter#53001 (flutter#53075)"
852b9fa 
This reverts commit b26e1b0.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eyebrowsoffire eyebrowsoffire eyebrowsoffire approved these changes

@johnmccutchan johnmccutchan johnmccutchan approved these changes

Assignees
No one assigned
Labels
autosubmit Merge PR when tree becomes green via auto submit App platform-android
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@gmackall @johnmccutchan @eyebrowsoffire