From 8de818dd2ae2fa6b9b672bbcf199b2ad4be46c27 Mon Sep 17 00:00:00 2001 From: Victoria Ashworth <15619084+vashworth@users.noreply.github.com> Date: Wed, 17 Jan 2024 14:32:12 -0600 Subject: [PATCH] Update tests to Xcode 15 (#141706) Framework part of https://github.com/flutter/flutter/issues/132237. --- .ci.yaml | 232 ++++--------------------------------------------------- 1 file changed, 17 insertions(+), 215 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index 4839b40e4f3..c490369b06c 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -83,11 +83,11 @@ platform_properties: [ {"dependency": "apple_signing", "version": "version:to_2024"} ] - os: Mac-12|Mac-13 + os: Mac-13 device_type: none $flutter/osx_sdk : >- { - "sdk_version": "14e300c" + "sdk_version": "15a240d" } mac_arm64: properties: @@ -99,12 +99,12 @@ platform_properties: [ {"dependency": "apple_signing", "version": "version:to_2024"} ] - os: Mac-12|Mac-13 + os: Mac-13 device_type: none cpu: arm64 $flutter/osx_sdk : >- { - "sdk_version": "14e300c" + "sdk_version": "15a240d" } mac_benchmark: properties: @@ -118,12 +118,12 @@ platform_properties: ] device_type: none mac_model: "Macmini8,1" - os: Mac-12|Mac-13 + os: Mac-13 tags: > ["devicelab", "hostonly", "mac"] $flutter/osx_sdk : >- { - "sdk_version": "14e300c" + "sdk_version": "15a240d" } mac_x64: properties: @@ -135,12 +135,12 @@ platform_properties: [ {"dependency": "apple_signing", "version": "version:to_2024"} ] - os: Mac-12|Mac-13 + os: Mac-13 device_type: none cpu: x86 $flutter/osx_sdk : >- { - "sdk_version": "14e300c" + "sdk_version": "15a240d" } mac_build_test: properties: @@ -153,12 +153,12 @@ platform_properties: {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}, {"dependency": "apple_signing", "version": "version:to_2024"} ] - os: Mac-12|Mac-13 + os: Mac-13 device_type: none cpu: x86 $flutter/osx_sdk : >- { - "sdk_version": "14e300c" + "sdk_version": "15a240d" } mac_android: properties: @@ -202,12 +202,12 @@ platform_properties: {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}, {"dependency": "apple_signing", "version": "version:to_2024"} ] - os: Mac-12|Mac-13 + os: Mac-13 cpu: x86 device_os: iOS-16|iOS-17 $flutter/osx_sdk : >- { - "sdk_version": "14e300c" + "sdk_version": "15a240d" } mac_arm64_ios: properties: @@ -220,12 +220,12 @@ platform_properties: {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}, {"dependency": "apple_signing", "version": "none"} ] - os: Mac-12|Mac-13 + os: Mac-13 cpu: arm64 device_os: iOS-16|iOS-17 $flutter/osx_sdk : >- { - "sdk_version": "14e300c" + "sdk_version": "15a240d" } windows: properties: @@ -3010,12 +3010,6 @@ targets: tags: > ["devicelab", "ios", "mac"] task_name: animated_advanced_blend_perf_ios__timeline_summary - # TODO(vashworth): Remove after Xcode 15 is default in CI (https://github.com/flutter/flutter/issues/132237) - $flutter/osx_sdk : >- - { - "sdk_version": "15a240d" - } - os: Mac-13 # Uses Impeller. - name: Linux_pixel_7pro animated_blur_backdrop_filter_perf_opengles__timeline_summary @@ -3082,12 +3076,6 @@ targets: tags: > ["devicelab", "ios", "mac"] task_name: dynamic_path_tessellation_perf_ios__timeline_summary - # TODO(vashworth): Remove after Xcode 15 is default in CI (https://github.com/flutter/flutter/issues/132237) - $flutter/osx_sdk : >- - { - "sdk_version": "15a240d" - } - os: Mac-13 - name: Staging_build_linux analyze presubmit: false @@ -3569,12 +3557,6 @@ targets: tags: > ["devicelab", "ios", "mac", "arm64"] task_name: module_test_ios - # TODO(vashworth): Remove after Xcode 15 is default in CI (https://github.com/flutter/flutter/issues/132237) - $flutter/osx_sdk : >- - { - "sdk_version": "15a240d" - } - os: Mac-13 runIf: - dev/** - packages/flutter_tools/** @@ -4063,12 +4045,6 @@ targets: tags: > ["devicelab", "ios", "mac"] task_name: animation_with_microtasks_perf_ios__timeline_summary - # TODO(vashworth): Remove after Xcode 15 is default in CI (https://github.com/flutter/flutter/issues/132237) - $flutter/osx_sdk : >- - { - "sdk_version": "15a240d" - } - os: Mac-13 - name: Mac_ios backdrop_filter_perf_ios__timeline_summary recipe: devicelab/devicelab_drone @@ -4087,12 +4063,6 @@ targets: tags: > ["devicelab", "ios", "mac"] task_name: basic_material_app_ios__compile - # TODO(vashworth): Remove after Xcode 15 is default in CI (https://github.com/flutter/flutter/issues/132237) - $flutter/osx_sdk : >- - { - "sdk_version": "15a240d" - } - os: Mac-13 - name: Mac_ios channels_integration_test_ios recipe: devicelab/devicelab_drone @@ -4102,12 +4072,6 @@ targets: tags: > ["devicelab", "ios", "mac"] task_name: channels_integration_test_ios - # TODO(vashworth): Remove after Xcode 15 is default in CI (https://github.com/flutter/flutter/issues/132237) - $flutter/osx_sdk : >- - { - "sdk_version": "15a240d" - } - os: Mac-13 - name: Mac_ios complex_layout_ios__start_up recipe: devicelab/devicelab_drone @@ -4126,12 +4090,6 @@ targets: tags: > ["devicelab", "ios", "mac"] task_name: complex_layout_scroll_perf_ios__timeline_summary - # TODO(vashworth): Remove after Xcode 15 is default in CI (https://github.com/flutter/flutter/issues/132237) - $flutter/osx_sdk : >- - { - "sdk_version": "15a240d" - } - os: Mac-13 - name: Mac_ios complex_layout_scroll_perf_bad_ios__timeline_summary recipe: devicelab/devicelab_drone @@ -4150,12 +4108,6 @@ targets: tags: > ["devicelab", "ios", "mac"] task_name: color_filter_and_fade_perf_ios__e2e_summary - # TODO(vashworth): Remove after Xcode 15 is default in CI (https://github.com/flutter/flutter/issues/132237) - $flutter/osx_sdk : >- - { - "sdk_version": "15a240d" - } - os: Mac-13 - name: Mac_ios imagefiltered_transform_animation_perf_ios__timeline_summary recipe: devicelab/devicelab_drone @@ -4165,12 +4117,6 @@ targets: tags: > ["devicelab", "ios", "mac"] task_name: imagefiltered_transform_animation_perf_ios__timeline_summary - # TODO(vashworth): Remove after Xcode 15 is default in CI (https://github.com/flutter/flutter/issues/132237) - $flutter/osx_sdk : >- - { - "sdk_version": "15a240d" - } - os: Mac-13 - name: Mac_ios external_ui_integration_test_ios recipe: devicelab/devicelab_drone @@ -4190,12 +4136,6 @@ targets: tags: > ["devicelab", "ios", "mac"] task_name: route_test_ios - # TODO(vashworth): Remove after Xcode 15 is default in CI (https://github.com/flutter/flutter/issues/132237) - $flutter/osx_sdk : >- - { - "sdk_version": "15a240d" - } - os: Mac-13 - name: Mac_ios flavors_test_ios recipe: devicelab/devicelab_drone @@ -4214,26 +4154,20 @@ targets: tags: > ["devicelab", "ios", "mac"] task_name: flavors_test_ios_xcode_debug - # TODO(vashworth): Remove after Xcode 15 is default in CI (https://github.com/flutter/flutter/issues/132237) - $flutter/osx_sdk : >- - { - "sdk_version": "15c500b" - } - os: Mac-13 bringup: true - # TODO(vashworth): Stop running in presubmit after macOS 13 upgrade is complete (https://github.com/flutter/flutter/issues/134737) - name: Mac_ios flutter_gallery_ios__compile recipe: devicelab/devicelab_drone + presubmit: false timeout: 60 properties: tags: > ["devicelab", "ios", "mac"] task_name: flutter_gallery_ios__compile - # TODO(vashworth): Stop running in presubmit after macOS 13 upgrade is complete (https://github.com/flutter/flutter/issues/134737) - name: Mac_arm64_ios flutter_gallery_ios__compile recipe: devicelab/devicelab_drone + presubmit: false timeout: 60 properties: tags: > @@ -4257,12 +4191,6 @@ targets: tags: > ["devicelab", "ios", "mac"] task_name: flutter_gallery_ios__start_up_xcode_debug - # TODO(vashworth): Remove after Xcode 15 is default in CI (https://github.com/flutter/flutter/issues/132237) - $flutter/osx_sdk : >- - { - "sdk_version": "15c500b" - } - os: Mac-13 bringup: true - name: Mac_ios flutter_view_ios__start_up @@ -4273,12 +4201,6 @@ targets: tags: > ["devicelab", "ios", "mac"] task_name: flutter_view_ios__start_up - # TODO(vashworth): Remove after Xcode 15 is default in CI (https://github.com/flutter/flutter/issues/132237) - $flutter/osx_sdk : >- - { - "sdk_version": "15a240d" - } - os: Mac-13 - name: Mac_ios hello_world_ios__compile recipe: devicelab/devicelab_drone @@ -4297,12 +4219,6 @@ targets: tags: > ["devicelab", "ios", "mac", "arm64"] task_name: hello_world_ios__compile - # TODO(vashworth): Remove after Xcode 15 is default in CI (https://github.com/flutter/flutter/issues/132237) - $flutter/osx_sdk : >- - { - "sdk_version": "15a240d" - } - os: Mac-13 - name: Mac_x64 hot_mode_dev_cycle_macos_target__benchmark recipe: devicelab/devicelab_drone @@ -4343,12 +4259,6 @@ targets: tags: > ["devicelab", "ios", "mac"] task_name: integration_test_test_ios - # TODO(vashworth): Remove after Xcode 15 is default in CI (https://github.com/flutter/flutter/issues/132237) - $flutter/osx_sdk : >- - { - "sdk_version": "15a240d" - } - os: Mac-13 - name: Mac_ios integration_ui_ios_driver recipe: devicelab/devicelab_drone @@ -4367,12 +4277,6 @@ targets: tags: > ["devicelab", "ios", "mac"] task_name: integration_ui_ios_driver_xcode_debug - # TODO(vashworth): Remove after Xcode 15 is default in CI (https://github.com/flutter/flutter/issues/132237) - $flutter/osx_sdk : >- - { - "sdk_version": "15c500b" - } - os: Mac-13 bringup: true - name: Mac_ios integration_ui_ios_frame_number @@ -4392,12 +4296,6 @@ targets: tags: > ["devicelab", "ios", "mac"] task_name: integration_ui_ios_keyboard_resize - # TODO(vashworth): Remove after Xcode 15 is default in CI (https://github.com/flutter/flutter/issues/132237) - $flutter/osx_sdk : >- - { - "sdk_version": "15a240d" - } - os: Mac-13 - name: Mac_ios integration_ui_ios_textfield recipe: devicelab/devicelab_drone @@ -4442,12 +4340,6 @@ targets: tags: > ["devicelab", "ios", "mac"] task_name: ios_content_validation_test - # TODO(vashworth): Remove after Xcode 15 is default in CI (https://github.com/flutter/flutter/issues/132237) - $flutter/osx_sdk : >- - { - "sdk_version": "15a240d" - } - os: Mac-13 - name: Mac_arm64_ios ios_content_validation_test recipe: devicelab/devicelab_drone @@ -4466,12 +4358,6 @@ targets: tags: > ["devicelab", "ios", "mac"] task_name: ios_defines_test - # TODO(vashworth): Remove after Xcode 15 is default in CI (https://github.com/flutter/flutter/issues/132237) - $flutter/osx_sdk : >- - { - "sdk_version": "15a240d" - } - os: Mac-13 - name: Mac_ios ios_platform_view_tests recipe: devicelab/devicelab_drone @@ -4481,12 +4367,6 @@ targets: tags: > ["devicelab", "ios", "mac"] task_name: ios_platform_view_tests - # TODO(vashworth): Remove after Xcode 15 is default in CI (https://github.com/flutter/flutter/issues/132237) - $flutter/osx_sdk : >- - { - "sdk_version": "15a240d" - } - os: Mac-13 - name: Mac_ios large_image_changer_perf_ios recipe: devicelab/devicelab_drone @@ -4496,12 +4376,6 @@ targets: tags: > ["devicelab", "ios", "mac"] task_name: large_image_changer_perf_ios - # TODO(vashworth): Remove after Xcode 15 is default in CI (https://github.com/flutter/flutter/issues/132237) - $flutter/osx_sdk : >- - { - "sdk_version": "15a240d" - } - os: Mac-13 - name: Mac_x64 macos_chrome_dev_mode recipe: devicelab/devicelab_drone @@ -4547,12 +4421,6 @@ targets: tags: > ["devicelab", "ios", "mac"] task_name: microbenchmarks_ios_xcode_debug - # TODO(vashworth): Remove after Xcode 15 is default in CI (https://github.com/flutter/flutter/issues/132237) - $flutter/osx_sdk : >- - { - "sdk_version": "15c500b" - } - os: Mac-13 bringup: true - name: Mac native_assets_ios_simulator @@ -4576,12 +4444,6 @@ targets: tags: > ["devicelab", "ios", "mac"] task_name: native_assets_ios - # TODO(vashworth): Remove after Xcode 15 is default in CI (https://github.com/flutter/flutter/issues/132237) - $flutter/osx_sdk : >- - { - "sdk_version": "15a240d" - } - os: Mac-13 - name: Mac_ios native_platform_view_ui_tests_ios recipe: devicelab/devicelab_drone @@ -4600,12 +4462,6 @@ targets: tags: > ["devicelab", "ios", "mac"] task_name: new_gallery_ios__transition_perf - # TODO(vashworth): Remove after Xcode 15 is default in CI (https://github.com/flutter/flutter/issues/132237) - $flutter/osx_sdk : >- - { - "sdk_version": "15a240d" - } - os: Mac-13 - name: Mac_ios new_gallery_skia_ios__transition_perf recipe: devicelab/devicelab_drone @@ -4633,12 +4489,6 @@ targets: tags: > ["devicelab", "ios", "mac"] task_name: platform_channel_sample_test_swift - # TODO(vashworth): Remove after Xcode 15 is default in CI (https://github.com/flutter/flutter/issues/132237) - $flutter/osx_sdk : >- - { - "sdk_version": "15a240d" - } - os: Mac-13 - name: Mac_ios platform_channels_benchmarks_ios recipe: devicelab/devicelab_drone @@ -4648,12 +4498,6 @@ targets: tags: > ["devicelab", "ios", "mac"] task_name: platform_channels_benchmarks_ios - # TODO(vashworth): Remove after Xcode 15 is default in CI (https://github.com/flutter/flutter/issues/132237) - $flutter/osx_sdk : >- - { - "sdk_version": "15a240d" - } - os: Mac-13 - name: Mac_ios platform_interaction_test_ios recipe: devicelab/devicelab_drone @@ -4663,12 +4507,6 @@ targets: tags: > ["devicelab", "ios", "mac"] task_name: platform_interaction_test_ios - # TODO(vashworth): Remove after Xcode 15 is default in CI (https://github.com/flutter/flutter/issues/132237) - $flutter/osx_sdk : >- - { - "sdk_version": "15a240d" - } - os: Mac-13 - name: Mac_ios platform_view_ios__start_up recipe: devicelab/devicelab_drone @@ -4723,12 +4561,6 @@ targets: tags: > ["devicelab", "ios", "mac"] task_name: wide_gamut_ios - # TODO(vashworth): Remove after Xcode 15 is default in CI (https://github.com/flutter/flutter/issues/132237) - $flutter/osx_sdk : >- - { - "sdk_version": "15a240d" - } - os: Mac-13 - name: Mac_ios hot_mode_dev_cycle_ios__benchmark recipe: devicelab/devicelab_drone @@ -4738,12 +4570,6 @@ targets: tags: > ["devicelab", "ios", "mac"] task_name: hot_mode_dev_cycle_ios__benchmark - # TODO(vashworth): Remove after Xcode 15 is default in CI (https://github.com/flutter/flutter/issues/132237) - $flutter/osx_sdk : >- - { - "sdk_version": "15a240d" - } - os: Mac-13 - name: Mac_x64 hot_mode_dev_cycle_ios_simulator recipe: devicelab/devicelab_drone @@ -4784,12 +4610,6 @@ targets: tags: > ["devicelab", "ios", "mac"] task_name: tiles_scroll_perf_ios__timeline_summary - # TODO(vashworth): Remove after Xcode 15 is default in CI (https://github.com/flutter/flutter/issues/132237) - $flutter/osx_sdk : >- - { - "sdk_version": "15a240d" - } - os: Mac-13 - name: Mac_build_test flutter_gallery__transition_perf_e2e_ios recipe: devicelab/devicelab_drone_build_test @@ -4799,7 +4619,7 @@ targets: ["devicelab", "ios", "mac"] task_name: flutter_gallery__transition_perf_e2e_ios drone_dimensions: > - ["device_os=iOS-16|iOS-17","os=Mac-12|Mac-13", "cpu=x86"] + ["device_os=iOS-16|iOS-17","os=Mac-13", "cpu=x86"] - name: Mac_ios animated_blur_backdrop_filter_perf_ios__timeline_summary recipe: devicelab/devicelab_drone @@ -4809,12 +4629,6 @@ targets: tags: > ["devicelab", "ios", "mac"] task_name: animated_blur_backdrop_filter_perf_ios__timeline_summary - # TODO(vashworth): Remove after Xcode 15 is default in CI (https://github.com/flutter/flutter/issues/132237) - $flutter/osx_sdk : >- - { - "sdk_version": "15a240d" - } - os: Mac-13 - name: Mac_ios draw_points_perf_ios__timeline_summary recipe: devicelab/devicelab_drone @@ -4824,12 +4638,6 @@ targets: tags: > ["devicelab", "ios", "mac"] task_name: draw_points_perf_ios__timeline_summary - # TODO(vashworth): Remove after Xcode 15 is default in CI (https://github.com/flutter/flutter/issues/132237) - $flutter/osx_sdk : >- - { - "sdk_version": "15a240d" - } - os: Mac-13 - name: Mac_ios spell_check_test recipe: devicelab/devicelab_drone @@ -4839,12 +4647,6 @@ targets: tags: > ["devicelab", "ios", "mac"] task_name: spell_check_test_ios - # TODO(vashworth): Remove after Xcode 15 is default in CI (https://github.com/flutter/flutter/issues/132237) - $flutter/osx_sdk : >- - { - "sdk_version": "15a240d" - } - os: Mac-13 - name: Mac native_ui_tests_macos recipe: devicelab/devicelab_drone