From 69d0ca60ef1d4744ab3e97b50243278016bbc2ce Mon Sep 17 00:00:00 2001 From: godofredoc Date: Tue, 24 Oct 2023 10:10:02 -0700 Subject: [PATCH] Migrate mac builds to ruby dep. (#136929) The ruby dependency has been automated to include cocoapods. Bug: https://github.com/flutter/flutter/issues/136377 --- .ci.yaml | 87 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 44 insertions(+), 43 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index 7f744106eb2..5b9bf347503 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -130,7 +130,7 @@ platform_properties: properties: dependencies: >- [ - {"dependency": "gems", "version": "v3.3.14"}, + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}, {"dependency": "apple_signing", "version": "version:2022_to_2023"} ] os: Mac-12 @@ -165,7 +165,7 @@ platform_properties: properties: dependencies: >- [ - {"dependency": "gems", "version": "v3.3.14"}, + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}, {"dependency": "apple_signing", "version": "version:2022_to_2023"} ] os: Mac-12 @@ -179,7 +179,7 @@ platform_properties: properties: dependencies: >- [ - {"dependency": "gems", "version": "v3.3.14"}, + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}, {"dependency": "apple_signing", "version": "none"} ] os: Mac-12 @@ -344,6 +344,7 @@ targets: - name: Linux ci_yaml flutter roller recipe: infra/ci_yaml + presubmit: false timeout: 30 properties: tags: > @@ -2920,7 +2921,7 @@ targets: properties: dependencies: >- [ - {"dependency": "gems", "version": "v3.3.14"} + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] task_name: animated_complex_opacity_perf_macos__e2e_summary @@ -2938,7 +2939,7 @@ targets: add_recipes_cq: "true" dependencies: >- [ - {"dependency": "gems", "version": "v3.3.14"} + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] tags: > ["devicelab", "hostonly", "mac"] @@ -2956,7 +2957,7 @@ targets: properties: dependencies: >- [ - {"dependency": "gems", "version": "v3.3.14"} + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] tags: > ["devicelab", "hostonly", "mac", "arm64"] @@ -2977,7 +2978,7 @@ targets: {"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "open_jdk", "version": "version:17"}, - {"dependency": "gems", "version": "v3.3.14"}, + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}, {"dependency": "goldctl", "version": "git_revision:f808dcff91b221ae313e540c09d79696cd08b8de"} ] shard: build_tests @@ -2995,7 +2996,7 @@ targets: {"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "open_jdk", "version": "version:17"}, - {"dependency": "gems", "version": "v3.3.14"}, + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}, {"dependency": "goldctl", "version": "git_revision:f808dcff91b221ae313e540c09d79696cd08b8de"} ] shard: build_tests @@ -3013,7 +3014,7 @@ targets: {"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "open_jdk", "version": "version:17"}, - {"dependency": "gems", "version": "v3.3.14"}, + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}, {"dependency": "goldctl", "version": "git_revision:f808dcff91b221ae313e540c09d79696cd08b8de"} ] shard: build_tests @@ -3031,7 +3032,7 @@ targets: {"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "open_jdk", "version": "version:17"}, - {"dependency": "gems", "version": "v3.3.14"}, + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}, {"dependency": "goldctl", "version": "git_revision:f808dcff91b221ae313e540c09d79696cd08b8de"} ] shard: build_tests @@ -3046,7 +3047,7 @@ targets: properties: dependencies: >- [ - {"dependency": "gems", "version": "v3.3.14"} + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] task_name: complex_layout_macos__start_up @@ -3057,7 +3058,7 @@ targets: properties: dependencies: >- [ - {"dependency": "gems", "version": "v3.3.14"} + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] task_name: complex_layout_scroll_perf_macos__timeline_summary @@ -3078,7 +3079,7 @@ targets: properties: dependencies: >- [ - {"dependency": "gems", "version": "v3.3.14"} + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] tags: > ["devicelab", "hostonly", "mac"] @@ -3096,7 +3097,7 @@ targets: properties: dependencies: >- [ - {"dependency": "gems", "version": "v3.3.14"} + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] task_name: flutter_gallery_macos__compile @@ -3107,7 +3108,7 @@ targets: properties: dependencies: >- [ - {"dependency": "gems", "version": "v3.3.14"} + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] task_name: flutter_gallery_macos__start_up @@ -3175,7 +3176,7 @@ targets: dependencies: >- [ {"dependency": "goldctl", "version": "git_revision:f808dcff91b221ae313e540c09d79696cd08b8de"}, - {"dependency": "gems", "version": "v3.3.14"}, + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}, {"dependency": "open_jdk", "version": "version:17"}, {"dependency": "android_sdk", "version": "version:33v6"} ] @@ -3254,7 +3255,7 @@ targets: properties: dependencies: >- [ - {"dependency": "gems", "version": "v3.3.14"} + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] tags: > ["devicelab", "mac"] @@ -3321,7 +3322,7 @@ targets: cpu: x86 # Codesigning fails on ARM https://github.com/flutter/flutter/issues/112033 dependencies: >- [ - {"dependency": "gems", "version": "v3.3.14"} + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] tags: > ["devicelab", "hostonly", "mac"] @@ -3370,7 +3371,7 @@ targets: [ {"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "open_jdk", "version": "version:11"}, - {"dependency": "gems", "version": "v3.3.14"} + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] tags: > ["devicelab", "hostonly", "mac"] @@ -3387,7 +3388,7 @@ targets: properties: dependencies: >- [ - {"dependency": "gems", "version": "v3.3.14"} + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] tags: > ["devicelab", "hostonly", "mac"] @@ -3406,7 +3407,7 @@ targets: properties: dependencies: >- [ - {"dependency": "gems", "version": "v3.3.14"} + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] tags: > ["devicelab", "hostonly", "mac", "arm64"] @@ -3442,7 +3443,7 @@ targets: properties: dependencies: >- [ - {"dependency": "gems", "version": "v3.3.14"} + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] tags: > ["devicelab", "hostonly", "mac"] @@ -3459,7 +3460,7 @@ targets: properties: dependencies: >- [ - {"dependency": "gems", "version": "v3.3.14"} + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] tags: > ["devicelab", "hostonly", "mac"] @@ -3476,7 +3477,7 @@ targets: properties: dependencies: >- [ - {"dependency": "gems", "version": "v3.3.14"} + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] shard: tool_host_cross_arch_tests tags: > @@ -3494,7 +3495,7 @@ targets: properties: dependencies: >- [ - {"dependency": "gems", "version": "v3.3.14"} + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] shard: tool_host_cross_arch_tests tags: > @@ -3516,7 +3517,7 @@ targets: {"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "open_jdk", "version": "version:11"}, - {"dependency": "gems", "version": "v3.3.14"}, + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}, {"dependency": "goldctl", "version": "git_revision:f808dcff91b221ae313e540c09d79696cd08b8de"} ] shard: tool_integration_tests @@ -3540,7 +3541,7 @@ targets: {"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "open_jdk", "version": "version:11"}, - {"dependency": "gems", "version": "v3.3.14"}, + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}, {"dependency": "goldctl", "version": "git_revision:f808dcff91b221ae313e540c09d79696cd08b8de"} ] shard: tool_integration_tests @@ -3564,7 +3565,7 @@ targets: {"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "open_jdk", "version": "version:11"}, - {"dependency": "gems", "version": "v3.3.14"}, + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}, {"dependency": "goldctl", "version": "git_revision:f808dcff91b221ae313e540c09d79696cd08b8de"} ] shard: tool_integration_tests @@ -3588,7 +3589,7 @@ targets: {"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "open_jdk", "version": "version:11"}, - {"dependency": "gems", "version": "v3.3.14"}, + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}, {"dependency": "goldctl", "version": "git_revision:f808dcff91b221ae313e540c09d79696cd08b8de"} ] shard: tool_integration_tests @@ -3985,7 +3986,7 @@ targets: properties: dependencies: >- [ - {"dependency": "gems", "version": "v3.3.14"} + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] tags: > ["devicelab", "hostonly", "mac"] @@ -4001,7 +4002,7 @@ targets: properties: dependencies: >- [ - {"dependency": "gems", "version": "v3.3.14"} + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] tags: > ["devicelab", "hostonly", "mac", "arm64"] @@ -4075,7 +4076,7 @@ targets: properties: dependencies: >- [ - {"dependency": "gems", "version": "v3.3.14"} + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] tags: > ["devicelab", "hostonly", "mac"] @@ -4088,7 +4089,7 @@ targets: properties: dependencies: >- [ - {"dependency": "gems", "version": "v3.3.14"} + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] tags: > ["devicelab", "hostonly", "mac", "arm64"] @@ -4146,7 +4147,7 @@ targets: properties: dependencies: >- [ - {"dependency": "gems", "version": "v3.3.14"} + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] tags: > ["devicelab", "hostonly", "mac"] @@ -4159,7 +4160,7 @@ targets: properties: dependencies: >- [ - {"dependency": "gems", "version": "v3.3.14"} + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] tags: > ["devicelab", "hostonly", "mac", "arm64"] @@ -4196,7 +4197,7 @@ targets: properties: dependencies: >- [ - {"dependency": "gems", "version": "v3.3.14"} + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] tags: > ["devicelab", "hostonly", "mac"] @@ -4344,7 +4345,7 @@ targets: properties: dependencies: >- [ - {"dependency": "gems", "version": "v3.3.14"} + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] tags: > ["devicelab", "hostonly", "mac"] @@ -4421,7 +4422,7 @@ targets: properties: dependencies: >- [ - {"dependency": "gems", "version": "v3.3.14"} + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] tags: > ["devicelab", "hostonly", "mac"] @@ -4438,7 +4439,7 @@ targets: properties: dependencies: >- [ - {"dependency": "gems", "version": "v3.3.14"} + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] tags: > ["devicelab", "hostonly", "mac"] @@ -4455,7 +4456,7 @@ targets: properties: dependencies: >- [ - {"dependency": "gems", "version": "v3.3.14"} + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] tags: > ["devicelab", "hostonly", "mac"] @@ -4472,7 +4473,7 @@ targets: properties: dependencies: >- [ - {"dependency": "gems", "version": "v3.3.14"} + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] tags: > ["devicelab", "hostonly", "mac", "arm64"] @@ -4490,7 +4491,7 @@ targets: properties: dependencies: >- [ - {"dependency": "gems", "version": "v3.3.14"} + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] tags: > ["devicelab", "hostonly", "mac"] @@ -4508,7 +4509,7 @@ targets: properties: dependencies: >- [ - {"dependency": "gems", "version": "v3.3.14"} + {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} ] tags: > ["devicelab", "hostonly", "mac", "arm64"]