Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Conversation

@filmil
Copy link
Contributor

@filmil filmil commented Jun 4, 2024

Manual roll of the ICU library. This normally happens automatically, but this
time around, ICU folks changed their license, so that needs to be fixed up.
I wish they would stop doing that. :)

This manual change should enable us to turn the auto-roller back on.

flutter/flutter#149684

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.

@filmil filmil force-pushed the icu-jun-2024 branch 3 times, most recently from 6ca995f to f827858 Compare June 4, 2024 23:03
The wording change in the license file in ICU 74.1 required adapting
the license-recognizing regex pattern. This is why the roll is manual
instead of automated.

Similarly, changes in Unicode data files required expanding the
allowlist of patterns which have spurious occurences of the "Copyright"
symbol.

Issue: flutter/flutter#149684
@flutter-dashboard
Copy link

It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption to this rule, contact "@test-exemption-reviewer" in the #hackers channel in Chat (don't just cc them here, they won't see it! Use Discord!).

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.

@filmil
Copy link
Contributor Author

filmil commented Jun 4, 2024

@matanlurey Please review.

(if all passes, I will also need you to merge this, as I'm not a committer.)

Copy link
Member

@zanderso zanderso left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@filmil
Copy link
Contributor Author

filmil commented Jun 5, 2024

Can you please merge this for me? I am not a committer.

@matanlurey matanlurey added the autosubmit Merge PR when tree becomes green via auto submit App label Jun 5, 2024
@matanlurey
Copy link
Contributor

Can you please merge this for me? I am not a committer.

I've added autosubmit, as soon as the tree turns green it should auto-merge. Thanks for the fix!

@auto-submit auto-submit bot merged commit 75104be into flutter:main Jun 5, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 5, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 5, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 5, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 5, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 5, 2024
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Jun 5, 2024
…149770)

flutter/engine@11a32d4...f377330

2024-06-05 [email protected] Roll Skia from 37755d48cca3 to 8448abc95867 (7 revisions) (flutter/engine#53230)
2024-06-05 [email protected] Roll Dart SDK from dac7c04c7342 to f838a9a8d45f (3 revisions) (flutter/engine#53225)
2024-06-05 [email protected] Roll Skia from 337c3c4d1f1b to 37755d48cca3 (45 revisions) (flutter/engine#53224)
2024-06-05 [email protected] [web] enable always_specify_types for web_ui (flutter/engine#53226)
2024-06-05 [email protected] Re-land #52859: Revamp the engine style guide, remove `always_specify_types` (flutter/engine#53223)
2024-06-05 [email protected] Roll Fuchsia Linux SDK from pagJoGS4kQ8Efa_if... to 2xWubo2mRP_2_wXKJ... (flutter/engine#53222)
2024-06-05 [email protected] [icu] Manual roll of icu (flutter/engine#53199)
2024-06-05 98614782+auto-submit[bot]@users.noreply.github.com Reverts "[ios][platform_view] Use CAShapeLayer as the mask to avoid software rendering  (#53072)" (flutter/engine#53220)
2024-06-05 [email protected] [ios][platform_view] Use CAShapeLayer as the mask to avoid software rendering  (flutter/engine#53072)
2024-06-05 [email protected] Roll Dart SDK from 343c20614708 to dac7c04c7342 (1 revision) (flutter/engine#53209)
2024-06-04 [email protected] [Impeller] Intel iOS Simulators must block on GPU completion. (flutter/engine#53073)

Also rolling transitive DEPS:
  fuchsia/sdk/core/linux-amd64 from pagJoGS4kQ8E to 2xWubo2mRP_2

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
@ChristianEdwardPadilla
Copy link

ChristianEdwardPadilla commented Jun 6, 2024

The changes here seem to be causing license headers to fail to be identified.

See license compliance presubmit result here: cl/641003589.

Can this be rolled back?

EDIT: Wait, this might not be related to the issue we're seeing. Still investigating.

@filmil
Copy link
Contributor Author

filmil commented Jun 6, 2024

cl/641003589

Isn't this something that should be fixed downstream?

@filmil
Copy link
Contributor Author

filmil commented Jun 6, 2024

To wit, ICU license did change in ICU release 74.1 when compared to the license text that was in use in release 73.x. IANAL, but I think that the spirit of the new license should be compatible with the old one, so I don't think this creates any realistic downstream challenges. But it may trip a check or two.

So if downstream indeed has a rigid dependency on the ICU license not changing, well, then that check will need to be adapted.
(I now see that this may be a red herring. In case it isn't however, I still think it's a downstream problem.)

@matanlurey
Copy link
Contributor

@filmil I've engaged Christian in an internal chat - I also don't understand what we expect y'all to have done differently.

I'll come back here if we need any changes (unlikely)

@filmil
Copy link
Contributor Author

filmil commented Jun 6, 2024

@filmil I've engaged Christian in an internal chat - I also don't understand what we expect y'all to have done differently.

If I may venture a guess, I think downstream made a reasonable assumption that the upstream license wouldn't change. But it did.
This was my comment all the way at the top of this PR, emphasis mine:

Manual roll of the ICU library. This normally happens automatically, but this
time around, ICU folks changed their license, so that needs to be fixed up.
I wish they would stop doing that. :) [...]

@matanlurey
Copy link
Contributor

LOL. Thank you for that bit of humor :)

@matanlurey
Copy link
Contributor

The change was approved internally, no action required.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

autosubmit Merge PR when tree becomes green via auto submit App

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants