From 04870f2b2ba068ced6428c1383a63a1fce7733c6 Mon Sep 17 00:00:00 2001 From: Christopher Fujino Date: Wed, 14 Jul 2021 16:05:06 -0700 Subject: [PATCH 1/5] add platform properties and properties to .ci.yaml --- .ci.yaml | 155 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 154 insertions(+), 1 deletion(-) diff --git a/.ci.yaml b/.ci.yaml index 30df56c206f44..ccab5847f5910 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -7,47 +7,127 @@ # * https://github.com/flutter/cocoon/blob/master/CI_YAML.md enabled_branches: - master + - dev + - beta + - stable + +platform_properties: + linux: + properties: + caches: >- + [ + {"name":"builder_linux_engine","path":"builder"} + ] + os: Linux + mac: + properties: + caches: >- + [ + {"name":"flutter_cocoapods","path":"cocoapods"}, + {"name":"osx_sdk","path":"old_osx_sdk"}, + {"name":"builder_mac_engine","path":"builder"} + ] + os: Mac-10.15 + windows: + properties: + caches: >- + [ + {"name":"builder_win_engine","path":"builder"} + ] + timeout: "180" + os: Windows-10 targets: - name: Linux Android AOT Engine builder: Linux Android AOT Engine + recipe: engine + properties: + add_recipes_cq: "true" + build_android_aot: "true" + android_sdk_license: \n24333f8a63b6825ea9c5514f83c2829b004d1fee + android_sdk_preview_license: \n84831b9409646a918e30573bab4c9c91346d8abd + timeout: 60 scheduler: luci - name: Linux Android Debug Engine builder: Linux Android Debug Engine + recipe: engine + properties: + add_recipes_cq: "true" + build_android_debug: "true" + android_sdk_license: \n24333f8a63b6825ea9c5514f83c2829b004d1fee + android_sdk_preview_license: \n84831b9409646a918e30573bab4c9c91346d8abd + timeout: 60 scheduler: luci - name: Linux Android Scenarios builder: Linux Android Scenarios - postsubmit: false + recipe: engine/scenarios + properties: + upload_packages: "true" + clobber: "true" + timeout: 60 scheduler: luci - name: Linux Fuchsia builder: Linux Fuchsia + recipe: engine + properties: + add_recipes_cq: "true" + build_fuchsia: "true" + fuchsia_ctl_version: version:0.0.27 + timeout: 60 scheduler: luci - name: Linux Fuchsia FEMU builder: Linux Fuchsia FEMU + recipe: femu_test + properties: + add_recipes_cq: "true" + build_fuchsia: "true" + fuchsia_ctl_version: version:0.0.27 + timeout: 60 scheduler: luci - name: Linux Framework Smoke Tests builder: Linux Framework Smoke Tests + recipe: engine/framework_smoke + timeout: 60 scheduler: luci - name: Linux Host Engine builder: Linux Host Engine + recipe: engine + properties: + add_recipes_cq: "true" + build_host: "true" + timeout: 60 scheduler: luci - name: Linux Unopt builder: Linux Unopt + recipe: engine_unopt + properties: + add_recipes_cq: "true" + timeout: 75 scheduler: luci - name: Linux Arm Host Engine builder: Linux Arm Host Engine + recipe: engine/engine_arm + properties: + add_recipes_cq: "true" + build_host: "true" + timeout: 90 scheduler: luci - name: Linux Web Engine builder: Linux Web Engine + recipe: web_engine + properties: + add_recipes_cq: "true" + gcs_goldens_bucket: flutter_logs + timeout: 60 scheduler: luci runIf: - DEPS @@ -60,6 +140,13 @@ targets: - name: Linux Web Framework tests builder: Linux Web Framework tests + recipe: engine/web_engine_framework + properties: + add_recipes_cq: "true" + framework: "true" + shard: web_tests + subshards: 0, 1, 2, 3, 4, 5, 6, 7_last + timeout: 60 scheduler: luci runIf: - DEPS @@ -72,26 +159,58 @@ targets: - name: Mac Android AOT Engine builder: Mac Android AOT Engine + recipe: engine + properties: + android_sdk_license: \n24333f8a63b6825ea9c5514f83c2829b004d1fee + android_sdk_preview_license: \n84831b9409646a918e30573bab4c9c91346d8abd + build_android_aot: "true" + timeout: 60 scheduler: luci - name: Mac Android Debug Engine builder: Mac Android Debug Engine + recipe: engine + properties: + android_sdk_license: \n24333f8a63b6825ea9c5514f83c2829b004d1fee + android_sdk_preview_license: \n84831b9409646a918e30573bab4c9c91346d8abd + build_android_debug: "true" + timeout: 60 scheduler: luci - name: Mac Host Engine builder: Mac Host Engine + recipe: engine + properties: + add_recipes_cq: "true" + build_host: "true" + timeout: 75 scheduler: luci - name: Mac Unopt builder: Mac Unopt + recipe: engine_unopt + properties: + add_recipes_cq: "true" + jazzy_version: 0.9.5 + timeout: 75 scheduler: luci - name: Mac iOS Engine builder: Mac iOS Engine + recipe: engine + properties: + build_ios: "true" + ios_debug: "true" + jazzy_version: 0.9.5 + timeout: 60 scheduler: luci - name: Mac Web Engine builder: Mac Web Engine + recipe: web_engine + properties: + gcs_goldens_bucket: flutter_logs + timeout: 60 scheduler: luci runIf: - DEPS @@ -104,22 +223,44 @@ targets: - name: Windows Android AOT Engine builder: Windows Android AOT Engine + recipe: engine + properties: + build_android_aot: "true" + android_sdk_license: \n24333f8a63b6825ea9c5514f83c2829b004d1fee + android_sdk_preview_license: \n84831b9409646a918e30573bab4c9c91346d8abd + timeout: 60 scheduler: luci - name: Windows Host Engine builder: Windows Host Engine + recipe: engine + properties: + add_recipes_cq: "true" + build_host: "true" scheduler: luci - name: Windows Unopt builder: Windows Unopt + recipe: engine_unopt + properties: + add_recipes_cq: "true" + timeout: 75 scheduler: luci - name: Windows UWP Engine builder: Windows UWP Engine + recipe: engine + properties: + build_windows_uwp: "true" + timeout: 60 scheduler: luci - name: Windows Web Engine builder: Windows Web Engine + recipe: web_engine + properties: + gcs_goldens_bucket: flutter_logs + timeout: 60 scheduler: luci runIf: - DEPS @@ -129,10 +270,22 @@ targets: - name: Mac iOS Engine Profile builder: Mac iOS Engine Profile presubmit: false + recipe: engine + properties: + build_ios: "true" + ios_profile: "true" + jazzy_version: 0.9.5 + timeout: 90 scheduler: luci - name: Mac iOS Engine Release builder: Mac iOS Engine Release presubmit: false + recipe: engine + properties: + build_ios: "true" + ios_release: "true" + jazzy_version: 0.9.5 + timeout: 90 scheduler: luci From 4240e53b6d19496a6f1fa14fa1f142c1ba9990c1 Mon Sep 17 00:00:00 2001 From: Christopher Fujino Date: Wed, 14 Jul 2021 16:12:17 -0700 Subject: [PATCH 2/5] pin xcode 12 --- .ci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci.yaml b/.ci.yaml index ccab5847f5910..8c3e44d9d396d 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -28,6 +28,7 @@ platform_properties: {"name":"builder_mac_engine","path":"builder"} ] os: Mac-10.15 + xcode: 11e708 # Xcode 12 windows: properties: caches: >- From 66a3488abe31a6ce0eaa3a200970823428c5dbb5 Mon Sep 17 00:00:00 2001 From: Christopher Fujino Date: Wed, 14 Jul 2021 16:17:08 -0700 Subject: [PATCH 3/5] explicitly make xcode version a string --- .ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci.yaml b/.ci.yaml index 8c3e44d9d396d..1a379b2da7bda 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -28,7 +28,7 @@ platform_properties: {"name":"builder_mac_engine","path":"builder"} ] os: Mac-10.15 - xcode: 11e708 # Xcode 12 + xcode: "11e708" # Xcode 12 windows: properties: caches: >- From 093539030d112e4e49204096857216511396b7f3 Mon Sep 17 00:00:00 2001 From: Christopher Fujino Date: Wed, 14 Jul 2021 16:35:14 -0700 Subject: [PATCH 4/5] add candidate branch to enabled_branches --- .ci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci.yaml b/.ci.yaml index 1a379b2da7bda..ecf32f80167a5 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -10,6 +10,7 @@ enabled_branches: - dev - beta - stable + - flutter-2.4-candidate.4 platform_properties: linux: From 53d041a22b3cce7dd1bbcc67162860552156a30f Mon Sep 17 00:00:00 2001 From: Christopher Fujino Date: Thu, 15 Jul 2021 11:18:13 -0700 Subject: [PATCH 5/5] fix comment --- .ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci.yaml b/.ci.yaml index ecf32f80167a5..5289f00409156 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -29,7 +29,7 @@ platform_properties: {"name":"builder_mac_engine","path":"builder"} ] os: Mac-10.15 - xcode: "11e708" # Xcode 12 + xcode: "11e708" # Xcode 11 windows: properties: caches: >-