From 54f43235992e413edcc7aae05318cf83b8659374 Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Fri, 12 May 2023 22:00:58 -0700 Subject: [PATCH 1/5] Use release_build and os dimension consistently. Release_build property is used to signal that this build produces release artifacts that will eventually be SLSA compliant and will need to run from dart_internal. The os property is used to select the correct drone based on the platform the build should run on. Bug: https://github.com/flutter/flutter/issues/126118 Bug: https://github.com/flutter/flutter/issues/125983 Bug: https://github.com/flutter/flutter/issues/126116 --- .ci.yaml | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index 116fa5e5b7f87..ad74027eb1c55 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -259,6 +259,8 @@ targets: bringup: true recipe: engine_v2/engine_v2 timeout: 60 + dimensions: + os: "Linux" properties: release_build: "true" config_name: linux_fuchsia @@ -266,6 +268,8 @@ targets: - name: Linux linux_arm_host_engine recipe: engine_v2/engine_v2 timeout: 60 + dimensions: + os: "Linux" properties: release_build: "true" config_name: linux_arm_host_engine @@ -273,6 +277,8 @@ targets: - name: Linux linux_host_engine recipe: engine_v2/engine_v2 timeout: 60 + dimensions: + os: "Linux" properties: release_build: "true" config_name: linux_host_engine @@ -280,6 +286,8 @@ targets: - name: Linux linux_host_desktop_engine recipe: engine_v2/engine_v2 timeout: 60 + dimensions: + os: "Linux" properties: release_build: "true" config_name: linux_host_desktop_engine @@ -287,6 +295,8 @@ targets: - name: Linux linux_android_aot_engine recipe: engine_v2/engine_v2 timeout: 60 + dimensions: + os: "Linux" properties: release_build: "true" config_name: linux_android_aot_engine @@ -294,6 +304,8 @@ targets: - name: Linux linux_android_debug_engine recipe: engine_v2/engine_v2 timeout: 60 + dimensions: + os: "Linux" properties: release_build: "true" config_name: linux_android_debug_engine @@ -302,13 +314,14 @@ targets: recipe: engine_v2/builder timeout: 60 properties: - release_build: "true" config_name: linux_license clobber: "true" - name: Linux linux_web_engine recipe: engine_v2/engine_v2 timeout: 70 + dimensions: + os: "Linux" properties: release_build: "true" config_name: linux_web_engine @@ -317,7 +330,6 @@ targets: recipe: engine_v2/engine_v2 timeout: 60 properties: - release_build: "true" config_name: linux_unopt - name: Linux Web Framework tests @@ -374,7 +386,10 @@ targets: - name: Linux mac_android_aot_engine recipe: engine_v2/engine_v2 timeout: 60 + dimensions: + os: "Linux" properties: + release_build: "true" config_name: mac_android_aot_engine - name: Mac mac_clang_tidy @@ -399,6 +414,8 @@ targets: - name: Mac mac_host_engine recipe: engine_v2/engine_v2 timeout: 60 + dimensions: + os: "Mac" properties: release_build: "true" cpu: arm64 @@ -485,6 +502,8 @@ targets: - name: Mac mac_ios_engine recipe: engine_v2/engine_v2 timeout: 60 + dimensions: + os: "Mac" properties: release_build: "true" config_name: mac_ios_engine @@ -500,7 +519,6 @@ targets: recipe: engine_v2/engine_v2 timeout: 60 properties: - release_build: "true" cpu: arm64 config_name: mac_impeller_cmake_example @@ -526,6 +544,8 @@ targets: - name: Windows windows_android_aot_engine recipe: engine_v2/engine_v2 timeout: 60 + dimensions: + os: "Windows" properties: release_build: "true" config_name: windows_android_aot_engine @@ -533,6 +553,8 @@ targets: - name: Windows windows_host_engine recipe: engine_v2/engine_v2 timeout: 60 + dimensions: + os: "Windows" properties: release_build: "true" config_name: windows_host_engine @@ -540,6 +562,8 @@ targets: - name: Windows windows_arm_host_engine recipe: engine_v2/engine_v2 timeout: 60 + dimensions: + os: "Windows" enabled_branches: # Don't run this on release branches - main From f70ef37c71a7fbcfb1fd9681fcc925b8c3cb3472 Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Mon, 15 May 2023 10:22:19 -0700 Subject: [PATCH 2/5] Move to drone_dimensions. --- .ci.yaml | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index ad74027eb1c55..cd42a6ff1e87e 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -259,8 +259,8 @@ targets: bringup: true recipe: engine_v2/engine_v2 timeout: 60 - dimensions: - os: "Linux" + drone_dimensions: > + ["os=Linux"] properties: release_build: "true" config_name: linux_fuchsia @@ -268,8 +268,8 @@ targets: - name: Linux linux_arm_host_engine recipe: engine_v2/engine_v2 timeout: 60 - dimensions: - os: "Linux" + drone_dimensions: > + ["os=Linux"] properties: release_build: "true" config_name: linux_arm_host_engine @@ -286,8 +286,8 @@ targets: - name: Linux linux_host_desktop_engine recipe: engine_v2/engine_v2 timeout: 60 - dimensions: - os: "Linux" + drone_dimensions: > + ["os=Linux"] properties: release_build: "true" config_name: linux_host_desktop_engine @@ -295,8 +295,8 @@ targets: - name: Linux linux_android_aot_engine recipe: engine_v2/engine_v2 timeout: 60 - dimensions: - os: "Linux" + drone_dimensions: > + ["os=Linux"] properties: release_build: "true" config_name: linux_android_aot_engine @@ -304,8 +304,8 @@ targets: - name: Linux linux_android_debug_engine recipe: engine_v2/engine_v2 timeout: 60 - dimensions: - os: "Linux" + drone_dimensions: > + ["os=Linux"] properties: release_build: "true" config_name: linux_android_debug_engine @@ -320,8 +320,8 @@ targets: - name: Linux linux_web_engine recipe: engine_v2/engine_v2 timeout: 70 - dimensions: - os: "Linux" + drone_dimensions: > + ["os=Linux"] properties: release_build: "true" config_name: linux_web_engine @@ -386,8 +386,8 @@ targets: - name: Linux mac_android_aot_engine recipe: engine_v2/engine_v2 timeout: 60 - dimensions: - os: "Linux" + drone_dimensions: > + ["os=Linux"] properties: release_build: "true" config_name: mac_android_aot_engine @@ -414,8 +414,8 @@ targets: - name: Mac mac_host_engine recipe: engine_v2/engine_v2 timeout: 60 - dimensions: - os: "Mac" + drone_dimensions: > + ["os=Mac"] properties: release_build: "true" cpu: arm64 @@ -502,8 +502,8 @@ targets: - name: Mac mac_ios_engine recipe: engine_v2/engine_v2 timeout: 60 - dimensions: - os: "Mac" + drone_dimensions: > + ["os=Mac"] properties: release_build: "true" config_name: mac_ios_engine @@ -544,8 +544,8 @@ targets: - name: Windows windows_android_aot_engine recipe: engine_v2/engine_v2 timeout: 60 - dimensions: - os: "Windows" + drone_dimensions: > + ["os=Windows"] properties: release_build: "true" config_name: windows_android_aot_engine @@ -553,8 +553,8 @@ targets: - name: Windows windows_host_engine recipe: engine_v2/engine_v2 timeout: 60 - dimensions: - os: "Windows" + drone_dimensions: > + ["os=Windows"] properties: release_build: "true" config_name: windows_host_engine @@ -562,8 +562,8 @@ targets: - name: Windows windows_arm_host_engine recipe: engine_v2/engine_v2 timeout: 60 - dimensions: - os: "Windows" + drone_dimensions: > + ["os=Windows"] enabled_branches: # Don't run this on release branches - main From 0c704e18c76e23ea14cf90fd9997e072c057006e Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Mon, 15 May 2023 10:55:55 -0700 Subject: [PATCH 3/5] Move to drone dimensions. --- .ci.yaml | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index cd42a6ff1e87e..588ef6e33c96d 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -259,20 +259,20 @@ targets: bringup: true recipe: engine_v2/engine_v2 timeout: 60 - drone_dimensions: > - ["os=Linux"] properties: release_build: "true" config_name: linux_fuchsia + drone_dimensions: > + ["os=Linux"] - name: Linux linux_arm_host_engine recipe: engine_v2/engine_v2 timeout: 60 - drone_dimensions: > - ["os=Linux"] properties: release_build: "true" config_name: linux_arm_host_engine + drone_dimensions: > + ["os=Linux"] - name: Linux linux_host_engine recipe: engine_v2/engine_v2 @@ -286,29 +286,29 @@ targets: - name: Linux linux_host_desktop_engine recipe: engine_v2/engine_v2 timeout: 60 - drone_dimensions: > - ["os=Linux"] properties: release_build: "true" config_name: linux_host_desktop_engine + drone_dimensions: > + ["os=Linux"] - name: Linux linux_android_aot_engine recipe: engine_v2/engine_v2 timeout: 60 - drone_dimensions: > - ["os=Linux"] properties: release_build: "true" config_name: linux_android_aot_engine + drone_dimensions: > + ["os=Linux"] - name: Linux linux_android_debug_engine recipe: engine_v2/engine_v2 timeout: 60 - drone_dimensions: > - ["os=Linux"] properties: release_build: "true" config_name: linux_android_debug_engine + drone_dimensions: > + ["os=Linux"] - name: Linux linux_license recipe: engine_v2/builder @@ -320,11 +320,11 @@ targets: - name: Linux linux_web_engine recipe: engine_v2/engine_v2 timeout: 70 - drone_dimensions: > - ["os=Linux"] properties: release_build: "true" config_name: linux_web_engine + drone_dimensions: > + ["os=Linux"] - name: Linux linux_unopt recipe: engine_v2/engine_v2 @@ -386,11 +386,11 @@ targets: - name: Linux mac_android_aot_engine recipe: engine_v2/engine_v2 timeout: 60 - drone_dimensions: > - ["os=Linux"] properties: release_build: "true" config_name: mac_android_aot_engine + drone_dimensions: > + ["os=Linux"] - name: Mac mac_clang_tidy recipe: engine_v2/engine_v2 @@ -414,8 +414,6 @@ targets: - name: Mac mac_host_engine recipe: engine_v2/engine_v2 timeout: 60 - drone_dimensions: > - ["os=Mac"] properties: release_build: "true" cpu: arm64 @@ -426,6 +424,8 @@ targets: ] $flutter/osx_sdk : >- { "sdk_version": "14e222b" } + drone_dimensions: > + ["os=Mac"] - name: Linux mac_unopt recipe: engine_v2/engine_v2 @@ -502,8 +502,6 @@ targets: - name: Mac mac_ios_engine recipe: engine_v2/engine_v2 timeout: 60 - drone_dimensions: > - ["os=Mac"] properties: release_build: "true" config_name: mac_ios_engine @@ -513,6 +511,8 @@ targets: [ {"dependency": "jazzy", "version": "0.14.1"} ] + drone_dimensions: > + ["os=Mac"] - name: Mac impeller-cmake-example bringup: true @@ -544,20 +544,20 @@ targets: - name: Windows windows_android_aot_engine recipe: engine_v2/engine_v2 timeout: 60 - drone_dimensions: > - ["os=Windows"] properties: release_build: "true" config_name: windows_android_aot_engine + drone_dimensions: > + ["os=Windows"] - name: Windows windows_host_engine recipe: engine_v2/engine_v2 timeout: 60 - drone_dimensions: > - ["os=Windows"] properties: release_build: "true" config_name: windows_host_engine + drone_dimensions: > + ["os=Windows"] - name: Windows windows_arm_host_engine recipe: engine_v2/engine_v2 From 49a94c5e3f8c6d0fca1a044514e6b45acca383d5 Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Mon, 15 May 2023 11:00:15 -0700 Subject: [PATCH 4/5] Move drone_dimensions to properties. --- .ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index 588ef6e33c96d..876225396c14f 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -562,14 +562,14 @@ targets: - name: Windows windows_arm_host_engine recipe: engine_v2/engine_v2 timeout: 60 - drone_dimensions: > - ["os=Windows"] enabled_branches: # Don't run this on release branches - main properties: release_build: "true" config_name: windows_arm_host_engine + drone_dimensions: > + ["os=Windows"] - name: Windows windows_unopt recipe: engine_v2/builder From 063cbe69c5f72a118bbf96172919f5f40bc00f38 Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Mon, 15 May 2023 11:38:30 -0700 Subject: [PATCH 5/5] Add version to os dimension. --- .ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index 876225396c14f..7a0526bb08d58 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -425,7 +425,7 @@ targets: $flutter/osx_sdk : >- { "sdk_version": "14e222b" } drone_dimensions: > - ["os=Mac"] + ["os=Mac-12"] - name: Linux mac_unopt recipe: engine_v2/engine_v2 @@ -512,7 +512,7 @@ targets: {"dependency": "jazzy", "version": "0.14.1"} ] drone_dimensions: > - ["os=Mac"] + ["os=Mac-12"] - name: Mac impeller-cmake-example bringup: true