From 80e299c6b06123d60b05267fae5abc9ae7ef2cdc Mon Sep 17 00:00:00 2001 From: godofredoc <54371434+godofredoc@users.noreply.github.com> Date: Thu, 12 Aug 2021 10:21:12 -0700 Subject: [PATCH] Update builder configurations to apply the new generators format. (flutter/engine#28038) Web engine required more complex generator configurations which forced us change the generator values from list to a dict. Bug: https://github.com/flutter/flutter/issues/81855 --- engine/src/flutter/ci/builders/mac_ios_engine.json | 14 ++++++++------ .../ci/builders/mac_ios_engine_profile.json | 2 +- .../ci/builders/mac_ios_engine_release.json | 2 +- .../flutter/ci/builders/windows_host_engine.json | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/engine/src/flutter/ci/builders/mac_ios_engine.json b/engine/src/flutter/ci/builders/mac_ios_engine.json index 6b382b36bfa..24b78fbd802 100644 --- a/engine/src/flutter/ci/builders/mac_ios_engine.json +++ b/engine/src/flutter/ci/builders/mac_ios_engine.json @@ -47,12 +47,14 @@ "mac_model=Macmini8,1", "os=Mac" ], - "generators": [ - { - "name": "BuildObjcDoc", - "script": "flutter/tools/gen_objcdoc.sh" - } - ], + "generators": { + "tasks": [ + { + "name": "BuildObjcDoc", + "scripts": ["flutter/tools/gen_objcdoc.sh"] + } + ] + }, "gn": [ "--bitcode", "--ios", diff --git a/engine/src/flutter/ci/builders/mac_ios_engine_profile.json b/engine/src/flutter/ci/builders/mac_ios_engine_profile.json index 682f8af7a27..dc4f2e25ab2 100644 --- a/engine/src/flutter/ci/builders/mac_ios_engine_profile.json +++ b/engine/src/flutter/ci/builders/mac_ios_engine_profile.json @@ -47,7 +47,7 @@ "mac_model=Macmini8,1", "os=Mac" ], - "generators": [], + "generators": {}, "gn": [ "--ios", "--runtime-mode", diff --git a/engine/src/flutter/ci/builders/mac_ios_engine_release.json b/engine/src/flutter/ci/builders/mac_ios_engine_release.json index 79ff5229615..98c5b741606 100644 --- a/engine/src/flutter/ci/builders/mac_ios_engine_release.json +++ b/engine/src/flutter/ci/builders/mac_ios_engine_release.json @@ -49,7 +49,7 @@ "mac_model=Macmini8,1", "os=Mac" ], - "generators": [], + "generators": {}, "gn": [ "--ios", "--runtime-mode", diff --git a/engine/src/flutter/ci/builders/windows_host_engine.json b/engine/src/flutter/ci/builders/windows_host_engine.json index 9443194fd9e..460f994ef43 100644 --- a/engine/src/flutter/ci/builders/windows_host_engine.json +++ b/engine/src/flutter/ci/builders/windows_host_engine.json @@ -67,7 +67,7 @@ "gclient_custom_vars": { "download_android_deps": false }, - "generators": [], + "generators": {}, "gn": [ "--runtime-mode", "release",