Skip to content

Commit 2333722

Browse files
victorsannivictorsanni
authored
Merge branch 'master' into autocomplete-soft-keyboard
2 parents a8962a7 + 6018856 commit 2333722

1,320 files changed

Lines changed: 98798 additions & 93257 deletions

File tree

Some content is hidden

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

‎.ci.yaml‎

Lines changed: 115 additions & 45 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
@@ -119,6 +121,17 @@ platform_properties:
119121
os: Linux
120122
device_type: "mokey"
121123

124+
linux_galaxy_s24:
125+
properties:
126+
dependencies: >-
127+
[
128+
{"dependency": "android_sdk", "version": "version:35v1"},
129+
{"dependency": "open_jdk", "version": "version:17"},
130+
{"dependency": "curl", "version": "version:7.64.0"}
131+
]
132+
os: Linux
133+
device_type: "SM-S921U1"
134+
122135
mac:
123136
properties:
124137
contexts: >-
@@ -239,6 +252,10 @@ platform_properties:
239252
os: Mac-13|Mac-14
240253
cpu: x86
241254
device_type: "mokey"
255+
$flutter/osx_sdk : >-
256+
{
257+
"skip_xcode_install": true
258+
}
242259
mac_arm64_mokey:
243260
properties:
244261
dependencies: >-
@@ -249,6 +266,10 @@ platform_properties:
249266
os: Mac-13|Mac-14
250267
cpu: arm64
251268
device_type: "mokey"
269+
$flutter/osx_sdk : >-
270+
{
271+
"skip_xcode_install": true
272+
}
252273
253274
mac_pixel_7pro:
254275
properties:
@@ -419,14 +440,6 @@ targets:
419440
presubmit_max_attempts: "2"
420441
timeout: 60
421442

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-
430443
- name: Linux build_aar_module_test
431444
recipe: devicelab/devicelab_drone
432445
timeout: 60
@@ -577,6 +590,12 @@ targets:
577590
timeout: 60
578591
dimensions:
579592
os: "Linux"
593+
enabled_branches:
594+
# Produces docs for main-api.flutter.dev
595+
# stable and beta are managed by the targets:
596+
# - Linux docs_deploy_beta
597+
# - Linux docs_deploy_stable
598+
- master
580599
properties:
581600
cores: "32"
582601
dependencies: >-
@@ -591,7 +610,6 @@ targets:
591610
validation_name: Docs
592611
firebase_project: main-docs-flutter-prod
593612
release_ref: refs/heads/master
594-
release_build: "true"
595613
drone_dimensions:
596614
- os=Linux
597615

@@ -679,10 +697,12 @@ targets:
679697
presubmit: false
680698
enabled_branches:
681699
- master
700+
timeout: 60 # TODO(https://github.com/flutter/flutter/issues/162654)
682701
properties:
683702
task_name: flutter_packaging
684703
tags: >
685704
["framework", "hostonly", "shard", "linux"]
705+
test_timeout_secs: "3600" # TODO(https://github.com/flutter/flutter/issues/162654)
686706
runIf:
687707
- .ci.yaml
688708
- engine/**
@@ -1121,6 +1141,15 @@ targets:
11211141
["devicelab", "hostonly", "linux"]
11221142
task_name: linux_desktop_impeller
11231143

1144+
- name: Linux_android_emu android_display_cutout
1145+
recipe: devicelab/devicelab_drone
1146+
timeout: 60
1147+
properties:
1148+
tags: >
1149+
["devicelab", "linux"]
1150+
task_name: android_display_cutout
1151+
presubmit_max_attempts: "2"
1152+
11241153
- name: Linux android_release_builds_exclude_dev_dependencies_test
11251154
recipe: devicelab/devicelab_drone
11261155
timeout: 60
@@ -1136,6 +1165,7 @@ targets:
11361165
task_name: android_release_builds_exclude_dev_dependencies_test
11371166
runIf:
11381167
- dev/**
1168+
- packages/flutter_tools/**
11391169
- bin/**
11401170
- .ci.yaml
11411171
- engine/**
@@ -1490,7 +1520,10 @@ targets:
14901520
dependencies: >-
14911521
[
14921522
{"dependency": "android_sdk", "version": "version:35v1"},
1493-
{"dependency": "open_jdk", "version": "version:17"}
1523+
{"dependency": "open_jdk", "version": "version:17"},
1524+
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
1525+
{"dependency": "cmake", "version": "build_id:8787856497187628321"},
1526+
{"dependency": "ninja", "version": "version:1.9.0"}
14941527
]
14951528
shard: tool_tests
14961529
subshard: commands
@@ -1538,6 +1571,20 @@ targets:
15381571
{"dependency": "goldctl", "version": "git_revision:2387d6fff449587eecbb7e45b2692ca0710b63b9"}
15391572
]
15401573
1574+
- name: Linux_mokey android_engine_vulkan_tests
1575+
recipe: flutter/flutter_drone
1576+
# TODO(matanlurey): https://github.com/flutter/flutter/issues/163025.
1577+
bringup: true
1578+
timeout: 60
1579+
properties:
1580+
shard: android_engine_vulkan_tests
1581+
tags: >
1582+
["framework", "hostonly", "shard", "linux"]
1583+
dependencies: >-
1584+
[
1585+
{"dependency": "goldctl", "version": "git_revision:2387d6fff449587eecbb7e45b2692ca0710b63b9"}
1586+
]
1587+
15411588
- name: Linux_android_emu android_engine_opengles_tests
15421589
recipe: flutter/flutter_drone
15431590
timeout: 60
@@ -2125,6 +2172,7 @@ targets:
21252172
["framework", "hostonly", "shard", "linux"]
21262173
# Retry for flakes caused by https://github.com/flutter/flutter/issues/132654
21272174
presubmit_max_attempts: "2"
2175+
test_timeout_secs: "3600" # https://github.com/flutter/flutter/issues/162714
21282176
runIf:
21292177
- dev/**
21302178
- packages/flutter_tools/**
@@ -2142,9 +2190,10 @@ targets:
21422190
task_name: android_defines_test
21432191
presubmit_max_attempts: "2"
21442192

2145-
- name: Linux_android_emu_34 android_defines_test
2193+
- name: Linux_android_emu_unstable android_defines_test
21462194
recipe: devicelab/devicelab_drone
21472195
timeout: 60
2196+
bringup: true
21482197
properties:
21492198
tags: >
21502199
["devicelab", "linux"]
@@ -2562,21 +2611,6 @@ targets:
25622611
task_name: external_textures_integration_test
25632612
presubmit_max_attempts: "2"
25642613

2565-
- name: Linux_android_emu_34 external_textures_integration_test
2566-
recipe: devicelab/devicelab_drone
2567-
timeout: 60
2568-
# Functionally the same as "presubmit: false", except that we will run on
2569-
# presubmit during engine rolls. This test is the *only* automated e2e
2570-
# test for external textures for the engine, it should never break.
2571-
runIf:
2572-
- engine/**
2573-
- DEPS
2574-
- .ci.yaml
2575-
properties:
2576-
tags: >
2577-
["devicelab", "linux"]
2578-
task_name: external_textures_integration_test
2579-
25802614
# linux mokey benchmark
25812615
- name: Linux_mokey fading_child_animation_perf__timeline_summary
25822616
recipe: devicelab/devicelab_drone
@@ -2724,15 +2758,6 @@ targets:
27242758
["devicelab", "android", "linux", "mokey"]
27252759
task_name: flutter_view__start_up
27262760

2727-
- name: Linux_pixel_7pro frame_policy_delay_test_android
2728-
recipe: devicelab/devicelab_drone
2729-
presubmit: false
2730-
timeout: 60
2731-
properties:
2732-
tags: >
2733-
["devicelab", "android", "linux", "pixel", "7pro"]
2734-
task_name: frame_policy_delay_test_android
2735-
27362761
# linux mokey benchmark
27372762
- name: Linux_mokey fullscreen_textfield_perf
27382763
recipe: devicelab/devicelab_drone
@@ -3060,6 +3085,17 @@ targets:
30603085
["devicelab", "android", "linux", "pixel", "7pro"]
30613086
task_name: new_gallery_impeller__transition_perf
30623087

3088+
# Samsung Galaxy S24, Impeller (Vulkan)
3089+
- name: Linux_galaxy_s24 new_gallery_impeller__transition_perf
3090+
recipe: devicelab/devicelab_drone
3091+
bringup: true
3092+
presubmit: false
3093+
timeout: 60
3094+
properties:
3095+
tags: >
3096+
["devicelab", "android", "linux", "samsung", "s24"]
3097+
task_name: new_gallery_impeller__transition_perf
3098+
30633099
# Pixel 7 Pro, Impeller (OpenGL)
30643100
- name: Linux_pixel_7pro new_gallery_opengles_impeller__transition_perf
30653101
recipe: devicelab/devicelab_drone
@@ -3185,6 +3221,16 @@ targets:
31853221
["devicelab", "android", "linux", "pixel", "7pro"]
31863222
task_name: platform_views_scroll_perf_impeller__timeline_summary
31873223

3224+
- name: Linux_pixel_7pro platform_views_hcpp_scroll_perf__timeline_summary
3225+
recipe: devicelab/devicelab_drone
3226+
presubmit: false
3227+
bringup: true
3228+
timeout: 60
3229+
properties:
3230+
tags: >
3231+
["devicelab", "android", "linux", "pixel", "7pro"]
3232+
task_name: platform_views_hcpp_scroll_perf__timeline_summary
3233+
31883234
# linux mokey benchmark
31893235
- name: Linux_mokey platform_view__start_up
31903236
recipe: devicelab/devicelab_drone
@@ -3522,6 +3568,7 @@ targets:
35223568
task_name: animated_complex_opacity_perf_macos__e2e_summary
35233569

35243570
- name: Mac_benchmark basic_material_app_macos__compile
3571+
bringup: true # Flaky https://github.com/flutter/flutter/issues/162364
35253572
presubmit: false
35263573
recipe: devicelab/devicelab_drone
35273574
timeout: 60
@@ -3531,8 +3578,6 @@ targets:
35313578
- name: Mac build_ios_framework_module_test
35323579
recipe: devicelab/devicelab_drone
35333580
timeout: 60
3534-
# Flake rate of >3.5% in presubmit
3535-
presubmit: false # https://github.com/flutter/flutter/issues/150642
35363581
properties:
35373582
add_recipes_cq: "true"
35383583
dependencies: >-
@@ -3787,7 +3832,6 @@ targets:
37873832
task_name: flavors_test_macos
37883833

37893834
- name: Mac_benchmark flutter_gallery_macos__compile
3790-
bringup: true # Flaky https://github.com/flutter/flutter/issues/160495
37913835
presubmit: false
37923836
recipe: devicelab/devicelab_drone
37933837
timeout: 60
@@ -3927,14 +3971,19 @@ targets:
39273971
recipe: flutter/flutter_drone
39283972
timeout: 60
39293973
properties:
3930-
os: Mac-13
3974+
os: Mac-14
39313975
dependencies: >-
39323976
[
39333977
{"dependency": "goldctl", "version": "git_revision:2387d6fff449587eecbb7e45b2692ca0710b63b9"},
39343978
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
39353979
{"dependency": "open_jdk", "version": "version:17"},
39363980
{"dependency": "android_sdk", "version": "version:35v1"}
39373981
]
3982+
# TODO(vashworth): Remove once Xcode 16 is used by all tests
3983+
$flutter/osx_sdk : >-
3984+
{
3985+
"sdk_version": "16c5032a"
3986+
}
39383987
shard: framework_tests
39393988
subshard: misc
39403989
tags: >
@@ -4106,8 +4155,6 @@ targets:
41064155
- name: Mac_arm64 module_test_ios
41074156
recipe: devicelab/devicelab_drone
41084157
timeout: 60
4109-
# Flake rate of >10% in presubmit
4110-
presubmit: false # https://github.com/flutter/flutter/issues/150642
41114158
properties:
41124159
dependencies: >-
41134160
[
@@ -4847,6 +4894,26 @@ targets:
48474894
["devicelab", "ios", "mac", "arm64"]
48484895
task_name: hello_world_ios__compile
48494896

4897+
- name: Mac_arm64_ios imitation_game_flutter
4898+
recipe: devicelab/devicelab_drone
4899+
presubmit: false
4900+
bringup: true
4901+
timeout: 60
4902+
properties:
4903+
tags: >
4904+
["devicelab", "ios", "mac", "arm64"]
4905+
task_name: imitation_game_swiftui__compile
4906+
4907+
- name: Mac_arm64_ios imitation_game_swiftui
4908+
recipe: devicelab/devicelab_drone
4909+
presubmit: false
4910+
bringup: true
4911+
timeout: 60
4912+
properties:
4913+
tags: >
4914+
["devicelab", "ios", "mac", "arm64"]
4915+
task_name: imitation_game_flutter__compile
4916+
48504917
- name: Mac_x64 hot_mode_dev_cycle_macos_target__benchmark
48514918
recipe: devicelab/devicelab_drone
48524919
timeout: 60
@@ -5833,6 +5900,7 @@ targets:
58335900
tags: >
58345901
["devicelab", "hostonly", "windows"]
58355902
task_name: build_android_host_app_with_module_aar
5903+
test_timeout_secs: "2700" # Allows 45 minutes (up from 30 default)
58365904
runIf:
58375905
- dev/**
58385906
- packages/flutter_tools/**
@@ -5952,6 +6020,7 @@ targets:
59526020
- DEPS
59536021

59546022
- name: Windows_arm64 plugin_test_windows
6023+
bringup: true # Flaky https://github.com/flutter/flutter/issues/163122
59556024
recipe: devicelab/devicelab_drone
59566025
presubmit: false
59576026
timeout: 60
@@ -6294,7 +6363,8 @@ targets:
62946363
dependencies: >-
62956364
[
62966365
{"dependency": "android_sdk", "version": "version:35v1"},
6297-
{"dependency": "open_jdk", "version": "version:17"}
6366+
{"dependency": "open_jdk", "version": "version:17"},
6367+
{"dependency": "vs_build", "version": "version:vs2019"}
62986368
]
62996369
shard: tool_tests
63006370
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:

0 commit comments

Comments
 (0)