From 75eff09609767faeef050f61769030ac08153537 Mon Sep 17 00:00:00 2001 From: godofredoc Date: Mon, 10 Apr 2023 17:05:58 -0700 Subject: [PATCH] Migrate ios_builders to engine_v2. (flutter/engine#40844) Migrate ios_builders to engine_v2. --- engine/src/flutter/.ci.yaml | 3 ++ .../flutter/ci/builders/mac_ios_engine.json | 48 +++++++------------ 2 files changed, 20 insertions(+), 31 deletions(-) diff --git a/engine/src/flutter/.ci.yaml b/engine/src/flutter/.ci.yaml index 32bbe05720..0822678118 100644 --- a/engine/src/flutter/.ci.yaml +++ b/engine/src/flutter/.ci.yaml @@ -423,6 +423,7 @@ targets: - "**.mm" - name: Mac iOS Engine + bringup: true recipe: engine/engine properties: add_recipes_cq: "true" @@ -491,6 +492,7 @@ targets: timeout: 75 - name: Mac iOS Engine Profile + bringup: true recipe: engine/engine properties: build_ios: "true" @@ -502,6 +504,7 @@ targets: - ci/** - name: Mac iOS Engine Release + bringup: true recipe: engine/engine properties: build_ios: "true" diff --git a/engine/src/flutter/ci/builders/mac_ios_engine.json b/engine/src/flutter/ci/builders/mac_ios_engine.json index fdce54033d..2c2fcf8eee 100644 --- a/engine/src/flutter/ci/builders/mac_ios_engine.json +++ b/engine/src/flutter/ci/builders/mac_ios_engine.json @@ -1,7 +1,6 @@ { "builds": [ { - "archives": [], "drone_dimensions": [ "device_type=none", "mac_model=Macmini8,1", @@ -16,13 +15,10 @@ ], "name": "ios_debug_sim", "ninja": { - "config": "ios_debug_sim", - "targets": [] - }, - "tests": [] + "config": "ios_debug_sim" + } }, { - "archives": [], "drone_dimensions": [ "device_type=none", "mac_model=Macmini8,1", @@ -38,19 +34,10 @@ ], "name": "ios_debug_sim_arm64", "ninja": { - "config": "ios_debug_sim_arm64", - "targets": [] - }, - "tests": [] + "config": "ios_debug_sim_arm64" + } }, { - "archives": [ - { - "base_path": "out/ios_debug/zip_archives/", - "include_paths": [], - "name": "ios_debug" - } - ], "drone_dimensions": [ "device_type=none", "mac_model=Macmini8,1", @@ -67,11 +54,9 @@ "targets": [ "flutter/shell/platform/darwin/ios:flutter_framework" ] - }, - "tests": [] + } }, { - "archives": [], "drone_dimensions": [ "device_type=none", "mac_model=Macmini8,1", @@ -89,11 +74,9 @@ "flutter/shell/platform/darwin/ios:flutter_framework", "flutter/lib/snapshot:generate_snapshot_bin" ] - }, - "tests": [] + } }, { - "archives": [], "drone_dimensions": [ "device_type=none", "mac_model=Macmini8,1", @@ -111,11 +94,9 @@ "flutter/shell/platform/darwin/ios:flutter_framework", "flutter/lib/snapshot:generate_snapshot_bin" ] - }, - "tests": [] + } } ], - "tests": [], "generators": { "tasks": [ { @@ -188,23 +169,28 @@ "archives": [ { "source": "out/debug/artifacts.zip", - "destination": "ios/artifacts.zip" + "destination": "ios/artifacts.zip", + "realm": "production" }, { "source": "out/profile/artifacts.zip", - "destination": "ios-profile/artifacts.zip" + "destination": "ios-profile/artifacts.zip", + "realm": "production" }, { "source": "out/debug/ios-objcdoc.zip", - "destination": "ios-objcdoc.zip" + "destination": "ios-objcdoc.zip", + "realm": "production" }, { "source": "out/release/artifacts.zip", - "destination": "ios-release/artifacts.zip" + "destination": "ios-release/artifacts.zip", + "realm": "production" }, { "source": "out/release/Flutter.dSYM.zip", - "destination": "ios-release/Flutter.dSYM.zip" + "destination": "ios-release/Flutter.dSYM.zip", + "realm": "production" } ] }