Skip to content

Manual roll Flutter to 58068d8ea4ec (42 revisions) #7099

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

Merged
merged 4 commits into from
Jul 13, 2024
Merged

Manual roll Flutter to 58068d8ea4ec (42 revisions) #7099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
25ed6cb
Manual roll Flutter from 5103d7574361 to 58068d8ea4ec (42 revisions)
ditman Jul 10, 2024
9c17a1e
[ci] Configure split all_packages build.
ditman Jul 12, 2024
97369d0
Same change for the stable build.
ditman Jul 12, 2024
93a29be
Remove unused yaml file.
ditman Jul 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 4 additions & 21 deletions .ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,23 +364,15 @@ targets:
timeout: 30
properties:
version_file: flutter_master.version
target_file: android_build_all_packages.yaml
# This builds the all_packages app only in a current JDK.
target_file: android_build_all_packages_jdk17.yaml
channel: master
# The legacy project build requires an older JDK.
Copy link
Collaborator

@stuartmorgan-g stuartmorgan-g Jul 11, 2024

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

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

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

Copy link
Member

@gmackall gmackall Jul 11, 2024

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 •
edited
Loading

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!

dependencies: >-
[
{"dependency": "open_jdk", "version": "version:11"}
]
env_variables: >-
{
"CHANNEL": "master"
}

- name: Linux_android android_build_all_packages_legacy master
# When making this `bringup: false`, update the task above to
# use target_file: android_build_all_packages_jdk17.yaml and
# remove its 'dependencies' section.
bringup: true # https://github.com/flutter/packages/pull/7099
recipe: packages/packages
timeout: 30
properties:
Expand All @@ -407,24 +399,15 @@ targets:
properties:
add_recipes_cq: "true"
version_file: flutter_stable.version
# This builds both legacy, and "modern" projects.
target_file: android_build_all_packages.yaml
# This builds the all_packages app only in a current JDK.
target_file: android_build_all_packages_jdk17.yaml
channel: stable
# The legacy project build requires an older JDK.
dependencies: >-
[
{"dependency": "open_jdk", "version": "version:11"}
]
env_variables: >-
{
"CHANNEL": "stable"
}

- name: Linux_android android_build_all_packages_legacy stable
# When making this `bringup: false`, update the task above to
# use target_file: android_build_all_packages_jdk17.yaml and
# remove its 'dependencies' section.
bringup: true # https://github.com/flutter/packages/pull/7099
recipe: packages/packages
timeout: 30
properties:
Expand Down
2 changes: 1 addition & 1 deletion .ci/flutter_master.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5103d757436124a08e6a8024ebacbf0cf4b2bacf
58068d8ea4eca8a17d99469697aaff46255522e9
27 changes: 0 additions & 27 deletions .ci/targets/android_build_all_packages.yaml
View file
Open in desktop

This file was deleted.