Skip to content

Commit 501ddb2

Browse files
dkyurtovdkyurtov
committed
Merge branch 'master' into replace-mainscreen-issue130832-issue130825
2 parents 5496c4a + 39b4951 commit 501ddb2

File tree

973 files changed

+78877
-70565
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

973 files changed

+78877
-70565
lines changed

‎.ci.yaml‎

Lines changed: 58 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@ platform_properties:
5858
cores: "8"
5959
device_type: none
6060
kvm: "1"
61-
linux_android_emu_34:
61+
# linux_android_emu_unstable is intended to be how flutter-android proves the stability
62+
# of new combinations of dependencies.
63+
linux_android_emu_unstable:
6264
properties:
6365
contexts: >-
6466
[
@@ -67,8 +69,8 @@ platform_properties:
6769
dependencies: >-
6870
[
6971
{"dependency": "android_sdk", "version": "version:35v1"},
70-
{"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"},
71-
{"dependency": "avd_cipd_version", "version": "build_id:8733065022087935185"},
72+
{"dependency": "android_virtual_device", "version": "android_35_google_apis_x64.textpb"},
73+
{"dependency": "avd_cipd_version", "version": "build_id:8723189955818532721"},
7274
{"dependency": "open_jdk", "version": "version:17"}
7375
]
7476
os: Ubuntu
@@ -419,14 +421,6 @@ targets:
419421
presubmit_max_attempts: "2"
420422
timeout: 60
421423

422-
- name: Linux_android_emu_34 android views
423-
recipe: devicelab/devicelab_drone
424-
properties:
425-
tags: >
426-
["framework","hostonly","linux"]
427-
task_name: android_views
428-
timeout: 60
429-
430424
- name: Linux build_aar_module_test
431425
recipe: devicelab/devicelab_drone
432426
timeout: 60
@@ -684,10 +678,12 @@ targets:
684678
presubmit: false
685679
enabled_branches:
686680
- master
681+
timeout: 60 # TODO(https://github.com/flutter/flutter/issues/162654)
687682
properties:
688683
task_name: flutter_packaging
689684
tags: >
690685
["framework", "hostonly", "shard", "linux"]
686+
test_timeout_secs: "3600" # TODO(https://github.com/flutter/flutter/issues/162654)
691687
runIf:
692688
- .ci.yaml
693689
- engine/**
@@ -1126,6 +1122,15 @@ targets:
11261122
["devicelab", "hostonly", "linux"]
11271123
task_name: linux_desktop_impeller
11281124

1125+
- name: Linux_android_emu android_display_cutout
1126+
recipe: devicelab/devicelab_drone
1127+
timeout: 60
1128+
properties:
1129+
tags: >
1130+
["devicelab", "linux"]
1131+
task_name: android_display_cutout
1132+
presubmit_max_attempts: "2"
1133+
11291134
- name: Linux android_release_builds_exclude_dev_dependencies_test
11301135
recipe: devicelab/devicelab_drone
11311136
timeout: 60
@@ -1495,7 +1500,10 @@ targets:
14951500
dependencies: >-
14961501
[
14971502
{"dependency": "android_sdk", "version": "version:35v1"},
1498-
{"dependency": "open_jdk", "version": "version:17"}
1503+
{"dependency": "open_jdk", "version": "version:17"},
1504+
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
1505+
{"dependency": "cmake", "version": "build_id:8787856497187628321"},
1506+
{"dependency": "ninja", "version": "version:1.9.0"}
14991507
]
15001508
shard: tool_tests
15011509
subshard: commands
@@ -1543,6 +1551,20 @@ targets:
15431551
{"dependency": "goldctl", "version": "git_revision:2387d6fff449587eecbb7e45b2692ca0710b63b9"}
15441552
]
15451553
1554+
- name: Linux_mokey android_engine_vulkan_tests
1555+
recipe: flutter/flutter_drone
1556+
# TODO(matanlurey): https://github.com/flutter/flutter/issues/163025.
1557+
bringup: true
1558+
timeout: 60
1559+
properties:
1560+
shard: android_engine_vulkan_tests
1561+
tags: >
1562+
["framework", "hostonly", "shard", "linux"]
1563+
dependencies: >-
1564+
[
1565+
{"dependency": "goldctl", "version": "git_revision:2387d6fff449587eecbb7e45b2692ca0710b63b9"}
1566+
]
1567+
15461568
- name: Linux_android_emu android_engine_opengles_tests
15471569
recipe: flutter/flutter_drone
15481570
timeout: 60
@@ -2130,6 +2152,7 @@ targets:
21302152
["framework", "hostonly", "shard", "linux"]
21312153
# Retry for flakes caused by https://github.com/flutter/flutter/issues/132654
21322154
presubmit_max_attempts: "2"
2155+
test_timeout_secs: "3600" # https://github.com/flutter/flutter/issues/162714
21332156
runIf:
21342157
- dev/**
21352158
- packages/flutter_tools/**
@@ -2147,9 +2170,10 @@ targets:
21472170
task_name: android_defines_test
21482171
presubmit_max_attempts: "2"
21492172

2150-
- name: Linux_android_emu_34 android_defines_test
2173+
- name: Linux_android_emu_unstable android_defines_test
21512174
recipe: devicelab/devicelab_drone
21522175
timeout: 60
2176+
bringup: true
21532177
properties:
21542178
tags: >
21552179
["devicelab", "linux"]
@@ -2567,21 +2591,6 @@ targets:
25672591
task_name: external_textures_integration_test
25682592
presubmit_max_attempts: "2"
25692593

2570-
- name: Linux_android_emu_34 external_textures_integration_test
2571-
recipe: devicelab/devicelab_drone
2572-
timeout: 60
2573-
# Functionally the same as "presubmit: false", except that we will run on
2574-
# presubmit during engine rolls. This test is the *only* automated e2e
2575-
# test for external textures for the engine, it should never break.
2576-
runIf:
2577-
- engine/**
2578-
- DEPS
2579-
- .ci.yaml
2580-
properties:
2581-
tags: >
2582-
["devicelab", "linux"]
2583-
task_name: external_textures_integration_test
2584-
25852594
# linux mokey benchmark
25862595
- name: Linux_mokey fading_child_animation_perf__timeline_summary
25872596
recipe: devicelab/devicelab_drone
@@ -2729,15 +2738,6 @@ targets:
27292738
["devicelab", "android", "linux", "mokey"]
27302739
task_name: flutter_view__start_up
27312740

2732-
- name: Linux_pixel_7pro frame_policy_delay_test_android
2733-
recipe: devicelab/devicelab_drone
2734-
presubmit: false
2735-
timeout: 60
2736-
properties:
2737-
tags: >
2738-
["devicelab", "android", "linux", "pixel", "7pro"]
2739-
task_name: frame_policy_delay_test_android
2740-
27412741
# linux mokey benchmark
27422742
- name: Linux_mokey fullscreen_textfield_perf
27432743
recipe: devicelab/devicelab_drone
@@ -3190,6 +3190,16 @@ targets:
31903190
["devicelab", "android", "linux", "pixel", "7pro"]
31913191
task_name: platform_views_scroll_perf_impeller__timeline_summary
31923192

3193+
- name: Linux_pixel_7pro platform_views_hcpp_scroll_perf__timeline_summary
3194+
recipe: devicelab/devicelab_drone
3195+
presubmit: false
3196+
bringup: true
3197+
timeout: 60
3198+
properties:
3199+
tags: >
3200+
["devicelab", "android", "linux", "pixel", "7pro"]
3201+
task_name: platform_views_hcpp_scroll_perf__timeline_summary
3202+
31933203
# linux mokey benchmark
31943204
- name: Linux_mokey platform_view__start_up
31953205
recipe: devicelab/devicelab_drone
@@ -3527,6 +3537,7 @@ targets:
35273537
task_name: animated_complex_opacity_perf_macos__e2e_summary
35283538

35293539
- name: Mac_benchmark basic_material_app_macos__compile
3540+
bringup: true # Flaky https://github.com/flutter/flutter/issues/162364
35303541
presubmit: false
35313542
recipe: devicelab/devicelab_drone
35323543
timeout: 60
@@ -3536,8 +3547,6 @@ targets:
35363547
- name: Mac build_ios_framework_module_test
35373548
recipe: devicelab/devicelab_drone
35383549
timeout: 60
3539-
# Flake rate of >3.5% in presubmit
3540-
presubmit: false # https://github.com/flutter/flutter/issues/150642
35413550
properties:
35423551
add_recipes_cq: "true"
35433552
dependencies: >-
@@ -3792,7 +3801,6 @@ targets:
37923801
task_name: flavors_test_macos
37933802

37943803
- name: Mac_benchmark flutter_gallery_macos__compile
3795-
bringup: true # Flaky https://github.com/flutter/flutter/issues/160495
37963804
presubmit: false
37973805
recipe: devicelab/devicelab_drone
37983806
timeout: 60
@@ -3932,14 +3940,19 @@ targets:
39323940
recipe: flutter/flutter_drone
39333941
timeout: 60
39343942
properties:
3935-
os: Mac-13
3943+
os: Mac-14
39363944
dependencies: >-
39373945
[
39383946
{"dependency": "goldctl", "version": "git_revision:2387d6fff449587eecbb7e45b2692ca0710b63b9"},
39393947
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
39403948
{"dependency": "open_jdk", "version": "version:17"},
39413949
{"dependency": "android_sdk", "version": "version:35v1"}
39423950
]
3951+
# TODO(vashworth): Remove once Xcode 16 is used by all tests
3952+
$flutter/osx_sdk : >-
3953+
{
3954+
"sdk_version": "16c5032a"
3955+
}
39433956
shard: framework_tests
39443957
subshard: misc
39453958
tags: >
@@ -4111,8 +4124,6 @@ targets:
41114124
- name: Mac_arm64 module_test_ios
41124125
recipe: devicelab/devicelab_drone
41134126
timeout: 60
4114-
# Flake rate of >10% in presubmit
4115-
presubmit: false # https://github.com/flutter/flutter/issues/150642
41164127
properties:
41174128
dependencies: >-
41184129
[
@@ -5858,6 +5869,7 @@ targets:
58585869
tags: >
58595870
["devicelab", "hostonly", "windows"]
58605871
task_name: build_android_host_app_with_module_aar
5872+
test_timeout_secs: "2700" # Allows 45 minutes (up from 30 default)
58615873
runIf:
58625874
- dev/**
58635875
- packages/flutter_tools/**
@@ -5977,6 +5989,7 @@ targets:
59775989
- DEPS
59785990

59795991
- name: Windows_arm64 plugin_test_windows
5992+
bringup: true # Flaky https://github.com/flutter/flutter/issues/163122
59805993
recipe: devicelab/devicelab_drone
59815994
presubmit: false
59825995
timeout: 60
@@ -6319,7 +6332,8 @@ targets:
63196332
dependencies: >-
63206333
[
63216334
{"dependency": "android_sdk", "version": "version:35v1"},
6322-
{"dependency": "open_jdk", "version": "version:17"}
6335+
{"dependency": "open_jdk", "version": "version:17"},
6336+
{"dependency": "vs_build", "version": "version:vs2019"}
63236337
]
63246338
shard: tool_tests
63256339
subshard: commands

‎.github/labeler.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,17 @@ team-infra:
229229
- any-glob-to-any-file:
230230
- docs/infra/**/*
231231

232+
team-ios:
233+
- changed-files:
234+
- any-glob-to-any-file:
235+
- engine/src/flutter/shell/platform/darwin/common/**/*
236+
- engine/src/flutter/shell/platform/darwin/ios/framework/**/*
237+
- packages/flutter_tools/**/ios/*
238+
- packages/flutter_tools/**/macos/*
239+
- packages/flutter_tools/**/*xcode*
240+
- packages/flutter_tools/**/*ios*
241+
- packages/flutter_tools/**/*macos*
242+
232243
team-release:
233244
- changed-files:
234245
- any-glob-to-any-file:

‎CHANGELOG.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,16 @@ docs/releases/Hotfix-Documentation-Best-Practices.md
2424
2525
INTERNAL NOTE
2626
-->
27-
2827
## Flutter 3.27 Changes
2928

29+
### [3.27.4](https://github.com/flutter/flutter/releases/tag/3.27.4)
30+
- [flutter/162132](https://github.com/flutter/flutter/pull/162132) On all platforms DropdownMenu's menuChildren might be placed somewhere far from menuAnchor.
31+
3032
### [3.27.3](https://github.com/flutter/flutter/releases/tag/3.27.3)
3133
- [flutter/159212](https://github.com/flutter/flutter/issues/159212) Track (via Google Analytics) if the Dart AOT Android "Deferred Components" feature is being meaningfully used.
3234
- [flutter/160631](https://github.com/flutter/flutter/issues/160631) Fixes an issue with Material 3 Tab Bar animations.
3335
- [flutter/159289](https://github.com/flutter/flutter/issues/159289) Fixes an issue with fullscreen route transitions.
36+
- [flutter/162132](https://github.com/flutter/flutter/issues/162132) Fixes an issue that incorrectly positions `MenuAnchor`s in nested overlays.
3437

3538
### [3.27.2](https://github.com/flutter/flutter/releases/tag/3.27.2)
3639

‎CODEOWNERS‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
/packages/flutter_tools/templates/**/Podfile* @jmagman
1111
/packages/flutter_tools/lib/src/ios/ @jmagman
1212

13-
# Working on flutter_driver improvements.
14-
# See https://github.com/flutter/flutter/issues/148028.
13+
# flutter_driver, integration_test, and internal dev infra.
14+
/dev/** @matanlurey
1515
/packages/flutter_driver/** @matanlurey
16+
/packages/integration_test/** @matanlurey

0 commit comments

Comments
 (0)