Skip to content

Commit

Permalink
Manual roll Flutter to 58068d8ea4ec (42 revisions) (#7099)
Browse files Browse the repository at this point in the history
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](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:

* #7110
  • Loading branch information
ditman authored Jul 13, 2024
1 parent 3379e51 commit 96f870e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 49 deletions.
25 changes: 4 additions & 21 deletions .ci.yaml
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.
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
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

This file was deleted.

0 comments on commit 96f870e

Please sign in to comment.