Skip to content

Commit 96f870e

Browse files
authored
Manual roll Flutter to 58068d8ea4ec (42 revisions) (flutter#7099)
This PR attempts to roll the `master` version of Flutter with a small CI tweak. ## [ci] Configures split `all_packages` build Continuing flutter#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](https://github.com/flutter/packages/pull/7098/checks?check_run_id=27296340933) of the "all_packages" app with the latest version of Flutter. ## Manual roll Flutter from 5103d7574361 to 58068d8ea4ec (42 revisions) Same as this roll triggered by the roller: * flutter#7110
1 parent 3379e51 commit 96f870e

File tree

3 files changed

+5
-49
lines changed

3 files changed

+5
-49
lines changed

.ci.yaml

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -364,23 +364,15 @@ targets:
364364
timeout: 30
365365
properties:
366366
version_file: flutter_master.version
367-
target_file: android_build_all_packages.yaml
367+
# This builds the all_packages app only in a current JDK.
368+
target_file: android_build_all_packages_jdk17.yaml
368369
channel: master
369-
# The legacy project build requires an older JDK.
370-
dependencies: >-
371-
[
372-
{"dependency": "open_jdk", "version": "version:11"}
373-
]
374370
env_variables: >-
375371
{
376372
"CHANNEL": "master"
377373
}
378374
379375
- name: Linux_android android_build_all_packages_legacy master
380-
# When making this `bringup: false`, update the task above to
381-
# use target_file: android_build_all_packages_jdk17.yaml and
382-
# remove its 'dependencies' section.
383-
bringup: true # https://github.com/flutter/packages/pull/7099
384376
recipe: packages/packages
385377
timeout: 30
386378
properties:
@@ -407,24 +399,15 @@ targets:
407399
properties:
408400
add_recipes_cq: "true"
409401
version_file: flutter_stable.version
410-
# This builds both legacy, and "modern" projects.
411-
target_file: android_build_all_packages.yaml
402+
# This builds the all_packages app only in a current JDK.
403+
target_file: android_build_all_packages_jdk17.yaml
412404
channel: stable
413-
# The legacy project build requires an older JDK.
414-
dependencies: >-
415-
[
416-
{"dependency": "open_jdk", "version": "version:11"}
417-
]
418405
env_variables: >-
419406
{
420407
"CHANNEL": "stable"
421408
}
422409
423410
- name: Linux_android android_build_all_packages_legacy stable
424-
# When making this `bringup: false`, update the task above to
425-
# use target_file: android_build_all_packages_jdk17.yaml and
426-
# remove its 'dependencies' section.
427-
bringup: true # https://github.com/flutter/packages/pull/7099
428411
recipe: packages/packages
429412
timeout: 30
430413
properties:

.ci/flutter_master.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5103d757436124a08e6a8024ebacbf0cf4b2bacf
1+
58068d8ea4eca8a17d99469697aaff46255522e9

.ci/targets/android_build_all_packages.yaml

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)