From d39fe7cba230abfacc03347846cc7d90022baa29 Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Wed, 12 Apr 2023 19:14:19 -0700 Subject: [PATCH] Migrate mac_host_engine to engine v2 builds. GN+Ninja artifacts have been validated manually. The number of files and their content is the same and presubmit tests are passing correctly in the engine and flutter. --- .ci.yaml | 1 + ci/builders/mac_host_engine.json | 49 ++++++++++++++++++++------------ 2 files changed, 32 insertions(+), 18 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index c89b7890e8df5..1745e53e67c82 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -332,6 +332,7 @@ targets: timeout: 60 - name: Mac Host Engine + bringup: true recipe: engine/engine properties: gclient_variables: >- diff --git a/ci/builders/mac_host_engine.json b/ci/builders/mac_host_engine.json index 775c9d6bb84d4..4632614e62370 100644 --- a/ci/builders/mac_host_engine.json +++ b/ci/builders/mac_host_engine.json @@ -10,7 +10,8 @@ "out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip", "out/host_debug/zip_archives/dart-sdk-darwin-x64.zip" ], - "name": "host_debug" + "name": "host_debug", + "realm": "production" } ], "drone_dimensions": [ @@ -36,7 +37,7 @@ "flutter/build/archives:artifacts", "flutter/build/archives:dart_sdk_archive", "flutter/build/archives:flutter_embedder_framework", - "flutter/build/dart:copy_dart_sdk", + "flutter/build/dart:copy_dart_sdk", "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework", "flutter/tools/font-subset", "flutter:unittests" @@ -66,7 +67,8 @@ "include_paths": [ "out/host_profile/zip_archives/darwin-x64-profile/artifacts.zip" ], - "name": "host_profile" + "name": "host_profile", + "realm": "production" } ], "drone_dimensions": [ @@ -88,7 +90,7 @@ "ninja": { "config": "host_profile", "targets": [ - "flutter/build/dart:copy_dart_sdk", + "flutter/build/dart:copy_dart_sdk", "flutter/build/archives:archive_gen_snapshot", "flutter/build/archives:artifacts", "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework", @@ -120,7 +122,8 @@ "out/host_release/zip_archives/darwin-x64-release/artifacts.zip", "out/host_release/zip_archives/darwin-x64/font-subset.zip" ], - "name": "host_release" + "name": "host_release", + "realm": "production" } ], "drone_dimensions": [ @@ -147,7 +150,7 @@ "targets": [ "flutter/build/archives:archive_gen_snapshot", "flutter/build/archives:artifacts", - "flutter/build/dart:copy_dart_sdk", + "flutter/build/dart:copy_dart_sdk", "flutter/impeller/golden_tests:impeller_golden_tests", "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework", "flutter/tools/font-subset", @@ -178,7 +181,8 @@ "out/mac_debug_arm64/zip_archives/darwin-arm64/artifacts.zip", "out/mac_debug_arm64/zip_archives/dart-sdk-darwin-arm64.zip" ], - "name": "mac_debug_arm64" + "name": "mac_debug_arm64", + "realm": "production" } ], "drone_dimensions": [ @@ -202,7 +206,7 @@ "ninja": { "config": "mac_debug_arm64", "targets": [ - "flutter/tools/font-subset", + "flutter/tools/font-subset", "flutter/build/archives:archive_gen_snapshot", "flutter/build/archives:artifacts", "flutter/build/archives:dart_sdk_archive", @@ -218,8 +222,9 @@ "type": "gcs", "include_paths": [ "out/mac_profile_arm64/zip_archives/darwin-arm64-profile/artifacts.zip" - ], - "name": "mac_profile_arm64" + ], + "name": "mac_profile_arm64", + "realm": "production" } ], "drone_dimensions": [ @@ -258,7 +263,8 @@ "out/mac_release_arm64/zip_archives/darwin-arm64/font-subset.zip", "out/mac_release_arm64/zip_archives/darwin-arm64-release/artifacts.zip" ], - "name": "mac_release_arm64" + "name": "mac_release_arm64", + "realm": "production" } ], "drone_dimensions": [ @@ -386,31 +392,38 @@ "archives": [ { "source": "out/release/framework/FlutterMacOS.dSYM.zip", - "destination": "darwin-x64-release/FlutterMacOS.dSYM.zip" + "destination": "darwin-x64-release/FlutterMacOS.dSYM.zip", + "realm": "production" }, { "source": "out/debug/framework/FlutterMacOS.framework.zip", - "destination": "darwin-x64/FlutterMacOS.framework.zip" + "destination": "darwin-x64/FlutterMacOS.framework.zip", + "realm": "production" }, { "source": "out/profile/framework/FlutterMacOS.framework.zip", - "destination": "darwin-x64-profile/FlutterMacOS.framework.zip" + "destination": "darwin-x64-profile/FlutterMacOS.framework.zip", + "realm": "production" }, { "source": "out/release/framework/FlutterMacOS.framework.zip", - "destination": "darwin-x64-release/FlutterMacOS.framework.zip" + "destination": "darwin-x64-release/FlutterMacOS.framework.zip", + "realm": "production" }, { "source": "out/debug/snapshot/gen_snapshot.zip", - "destination": "darwin-x64/gen_snapshot.zip" + "destination": "darwin-x64/gen_snapshot.zip", + "realm": "production" }, { "source": "out/profile/snapshot/gen_snapshot.zip", - "destination": "darwin-x64-profile/gen_snapshot.zip" + "destination": "darwin-x64-profile/gen_snapshot.zip", + "realm": "production" }, { "source": "out/release/snapshot/gen_snapshot.zip", - "destination": "darwin-x64-release/gen_snapshot.zip" + "destination": "darwin-x64-release/gen_snapshot.zip", + "realm": "production" } ] }