Skip to content

Conversation

@ditman
Copy link
Member

@ditman ditman commented Jul 10, 2024

This PR attempts to roll the master version of Flutter with a small CI tweak.

[ci] Configures split all_packages build

Continuing #7106:

  • Makes android_build_all_packages build with JDK17 only, and only a JDK17 project.
  • Gets android_build_all_packages_legacy out of bringup.

This should resolve the gradle issues of the "all_packages" app with the latest version of Flutter.

Manual roll Flutter from 5103d75 to 58068d8 (42 revisions)

Same as this roll triggered by the roller:

Pre-launch Checklist

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

.ci.yaml Outdated
Copy link
Collaborator

Choose a reason for hiding this comment

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

Unfortunately it looks like the tool still supports a version of Gradle old enough to require 11, so it's no longer possible to test the existing legacy project and the current template on the same setup.

Unless we want to lose some legacy coverage, I think we'll need to split out a new task, making regular build-all and legacy build-all entirely separate (with a TODO to recombine them once we drop the version of Gradle/AGP/etc. that requires 11). @reidbaker do you see any other option?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yep, I was looking at the legacy version of the app that is now failing.

Copy link
Member

Choose a reason for hiding this comment

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

That was essentially the motivation for setting up a Java 11 specific shard in flutter/flutter#151433. Sorry, I should have thought about how this would affect the packages legacy test.

Copy link
Member Author

@ditman ditman Jul 11, 2024

Choose a reason for hiding this comment

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

@gmackall I think you did exactly what @stuartmorgan is saying, splitting the legacy vs non-legacy builds. I'll prepare something similar for flutter/packages, and see what it looks like!

@ditman
Copy link
Member Author

ditman commented Jul 11, 2024

Linux_android android_build_all_packages_17plus master is a new builder added. it needs to be marked bringup: true

Nooooo

@ditman
Copy link
Member Author

ditman commented Jul 11, 2024

Can't find where the bringup:true build logs are (?)

@stuartmorgan-g
Copy link
Collaborator

It's pretty cumbersome to test new builders in advance. In practice, I recommend just adding the new thing in bringup mode and landing it without worrying about whether the script it runs works, and then fixing it in the PR where you take it out of bringup, since then you can just look at the presubmit runs as normal.

@ditman
Copy link
Member Author

ditman commented Jul 11, 2024

Shall we land this @stuartmorgan (after all mac tests stop flaking)? Please, do click the ✅ button!

@stuartmorgan-g
Copy link
Collaborator

Sorry, I should have explained better; landing it this way would cause us to lose coverage temporarily. The preferred way to do this is to make a new prequel PR that just adds the new builder, and then once that's in and filtered through infra (it used to be a full day, but now I think it's just a couple of hours?), then you update this PR to take the builder out of bring-up and make the other changes. That way there's no point where we have disabled tests for a while.

@gmackall
Copy link
Member

gmackall commented Jul 11, 2024

... and then once that's in and filtered through infra (it used to be a full day, but now I think it's just a couple of hours?)

FYI for some reason mine took ~21 hrs to start running automatically, see flutter/flutter#151615. Also they didn't start running until after I had triggered a re-run on one manually, but I have no clue if that was causal 🤷

@ditman
Copy link
Member Author

ditman commented Jul 11, 2024

then you update this PR to take the builder out of bring-up and make the other changes.

Ah, understood, I'll split the CI changes to a prequel PR. See you there!

@ditman
Copy link
Member Author

ditman commented Jul 12, 2024

Here goes @stuartmorgan:

I've already done stable because... no need to wait IMO, legacy will continue building with JDK11 and non-legacy will not have any overrides, and we may be able to land both at the same time?

stuartmorgan-g pushed a commit that referenced this pull request Jul 12, 2024
This PR introduces a new `android_build_all_packages_legacy` in `master`
and `stable` to build only the "legacy" version of an Android project
using JDK11.

This PR is required to resume rolling the flutter framework, like here:

* #7099
ditman added 2 commits July 12, 2024 11:28
Roll Flutter from 5103d75 to 58068d8 (42 revisions)

flutter/flutter@5103d75...58068d8

2024-07-12 [email protected] Reland: Move all Linux Moto G4 tests to mokey in staging (flutter/flutter#151654)
2024-07-12 [email protected] Update obsolete comment in InputDecorator test (flutter/flutter#151651)
2024-07-12 [email protected] Fix `TabBar` tab indicator stretch effect (flutter/flutter#150868)
2024-07-12 [email protected] Remove workaround for a bug in dart2wasm (flutter/flutter#151603)
2024-07-12 [email protected] [native_assets] Stop running link hooks in JIT mode (flutter/flutter#151534)
2024-07-12 [email protected] Roll `Switch.adaptive` changes into `CupertinoSwitch` (flutter/flutter#149465)
2024-07-11 [email protected] Unmark java11 tests as bringup:true (flutter/flutter#151612)
2024-07-11 [email protected] Add link to design document archive (flutter/flutter#151489)
2024-07-11 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Move all Linux Moto G4 tests to mokey in staging (#151608)" (flutter/flutter#151620)
2024-07-11 [email protected] Move all Linux Moto G4 tests to mokey in staging (flutter/flutter#151608)
2024-07-11 [email protected] docimports for API samples (flutter/flutter#151606)
2024-07-11 [email protected] docimports for flutter_goldens, flutter_localizations, flutter_web_plugins, fuchsia_remote_debug_protocol, integration_test (flutter/flutter#151271)
2024-07-11 [email protected] Re-enable debug canvaskit e2e tests. (flutter/flutter#151565)
2024-07-11 [email protected] Fix: Submenu anchor misaligned with child panel in web (Resolved #151081) (flutter/flutter#151294)
2024-07-11 [email protected] Replaced {@tool snippet} with {@tool dartpad} in CupertinoTabController (flutter/flutter#151272)
2024-07-11 [email protected] feat: Support overriding native endorsed plugins (flutter/flutter#137040)
2024-07-11 [email protected] expose keyboardType in DropdownMenu #150894 (flutter/flutter#150896)
2024-07-11 [email protected] docimports for flutter_driver (flutter/flutter#151267)
2024-07-11 [email protected] Add `TimeOfDay` comparison methods (flutter/flutter#151233)
2024-07-11 [email protected] Roll Flutter Engine from 6534fbf3c2c1 to 36dccf7bb25c (2 revisions) (flutter/flutter#151577)
2024-07-11 [email protected] Roll Flutter Engine from 1c23c8f64076 to 6534fbf3c2c1 (3 revisions) (flutter/flutter#151572)
2024-07-11 [email protected] Use correct locale for `CupertinoDatePicker` weekday (flutter/flutter#151494)
2024-07-10 [email protected] doc imports for enum values (flutter/flutter#151548)
2024-07-10 [email protected] Reland "Upgrade template Gradle, App AGP, Module AGP, and Kotlin versions, and tests"... but no longer upgrade module AGP version (flutter/flutter#151433)
2024-07-10 [email protected] Roll Packages from 14341d1 to ea35fc6 (16 revisions) (flutter/flutter#151556)
2024-07-10 [email protected] [CupertinoActionSheet] Fix padding and font size of buttons (flutter/flutter#151199)
2024-07-10 [email protected] Roll Flutter Engine from db2b45bea2c0 to 1c23c8f64076 (2 revisions) (flutter/flutter#151550)
2024-07-10 [email protected] Add docImports for flutter_test references (flutter/flutter#151175)
2024-07-10 [email protected] Mention not @-mentioning people in commit messages in tree hygiene (flutter/flutter#151487)
2024-07-10 [email protected] Roll Flutter Engine from 371db85f33d7 to db2b45bea2c0 (8 revisions) (flutter/flutter#151522)
2024-07-10 [email protected] fix heading level absorption, diagnostics; add tests and an a11y use-case (flutter/flutter#151421)
2024-07-10 [email protected] Roll Flutter Engine from 9d943eb2b37a to 371db85f33d7 (3 revisions) (flutter/flutter#151505)
2024-07-10 [email protected] Roll Flutter Engine from d3269d5855a7 to 9d943eb2b37a (5 revisions) (flutter/flutter#151495)
2024-07-09 [email protected] Update doc of `SemanticsProperties.identifier` (flutter/flutter#149915)
2024-07-09 [email protected] Clean up leaky test. (flutter/flutter#151131)
2024-07-09 [email protected] Roll pub packages (flutter/flutter#151492)
2024-07-09 [email protected] testAdd tests for stepper.controls_builder.0.dart (flutter/flutter#150669)
2024-07-09 [email protected] Add Semantics Property `linkUrl` (flutter/flutter#150639)
2024-07-09 [email protected] Roll Flutter Engine from 4a2ac0e51a8f to d3269d5855a7 (1 revision) (flutter/flutter#151488)
2024-07-09 [email protected] Link engine docs on AS setup in flutter/flutter docs on engine contributor setup (flutter/flutter#151481)
2024-07-09 [email protected] Roll Flutter Engine from 69075e7e87d4 to 4a2ac0e51a8f (21 revisions) (flutter/flutter#151482)
2024-07-09 [email protected] Fix Material 3 `Dialog` default background color (flutter/flutter#151400)

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
...
* Makes android_build_all_packages build with JDK17 only, and only a JDK17
project.
* Gets android_build_all_packages_legacy out of bringup.
@ditman ditman force-pushed the manual-roll-update-java-17 branch from 4386224 to 9c17a1e Compare July 12, 2024 18:33
Copy link
Collaborator

@stuartmorgan-g stuartmorgan-g left a comment

Choose a reason for hiding this comment

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

LGTM.

We should do the switch for stable too so that we're not using extra CI cycles to run the legacy build on stable both the old way (combined), and the new way (separated) in bring-up mode. But that can be a follow-up PR if you'd rather.

@ditman
Copy link
Member Author

ditman commented Jul 12, 2024

OK, updated the branch by removing the legacy android build from bringup:true, and making standard build only with JDK17. Also bumped the roll from 20 revisions to something newer (42 revisions).

/cc @stuartmorgan

@ditman ditman changed the title Manual roll Flutter to a1bd8434b555 (20 revisions) Manual roll Flutter to 58068d8ea4ec (42 revisions) Jul 12, 2024
@ditman ditman added the autosubmit Merge PR when tree becomes green via auto submit App label Jul 13, 2024
@ditman
Copy link
Member Author

ditman commented Jul 13, 2024

OK, autosubmit applied, let's go!

@auto-submit auto-submit bot merged commit 96f870e into flutter:main Jul 13, 2024
@ditman ditman deleted the manual-roll-update-java-17 branch July 13, 2024 02:05
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 15, 2024
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Jul 15, 2024
flutter/packages@3379e51...4a4e63e

2024-07-15 49699333+dependabot[bot]@users.noreply.github.com Bump actions/checkout from 4.1.6 to 4.1.7 (flutter/packages#6918)
2024-07-13 [email protected] Manual roll Flutter to 58068d8 (42 revisions) (flutter/packages#7099)

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-flutter-autoroll
Please CC [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
TytaniumDev pushed a commit to TytaniumDev/flutter that referenced this pull request Aug 7, 2024
flutter/packages@3379e51...4a4e63e

2024-07-15 49699333+dependabot[bot]@users.noreply.github.com Bump actions/checkout from 4.1.6 to 4.1.7 (flutter/packages#6918)
2024-07-13 [email protected] Manual roll Flutter to 58068d8 (42 revisions) (flutter/packages#7099)

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-flutter-autoroll
Please CC [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
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants