From 360cd7353eb5c9d646889278ffa249717696ced2 Mon Sep 17 00:00:00 2001 From: Keyong Han Date: Fri, 4 Nov 2022 13:44:55 -0700 Subject: [PATCH 1/7] general build_all_plugins --- .ci/scripts/build_all_plugins.sh | 9 +++++++-- .ci/targets/build_all_plugins.yaml | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.ci/scripts/build_all_plugins.sh b/.ci/scripts/build_all_plugins.sh index 734194615673..2ca0ae6de894 100644 --- a/.ci/scripts/build_all_plugins.sh +++ b/.ci/scripts/build_all_plugins.sh @@ -3,6 +3,11 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +arg="$1" cd all_packages -flutter build windows --debug -flutter build windows --release +if [[ "$arg" == "web" ]]; then + echo "Skipping; web does not support debug builds" +else + flutter build "$arg" --debug + flutter build "$arg" --release +fi diff --git a/.ci/targets/build_all_plugins.yaml b/.ci/targets/build_all_plugins.yaml index b51a5b18dfd9..6d0f065bdaf3 100644 --- a/.ci/targets/build_all_plugins.yaml +++ b/.ci/targets/build_all_plugins.yaml @@ -5,3 +5,4 @@ tasks: script: .ci/scripts/create_all_plugins_app.sh - name: build all_plugins script: .ci/scripts/build_all_plugins.sh + args: ['{{env "BUILD_ALL_ARGS" "windows"}}'] From a493c06c64d104f021e7873f5094c6514de7232e Mon Sep 17 00:00:00 2001 From: Keyong Han Date: Fri, 4 Nov 2022 16:11:38 -0700 Subject: [PATCH 2/7] add separate macos --- .ci/targets/build_all_plugins.yaml | 1 - .ci/targets/build_all_plugins_macos.yaml | 8 ++++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .ci/targets/build_all_plugins_macos.yaml diff --git a/.ci/targets/build_all_plugins.yaml b/.ci/targets/build_all_plugins.yaml index 6d0f065bdaf3..b51a5b18dfd9 100644 --- a/.ci/targets/build_all_plugins.yaml +++ b/.ci/targets/build_all_plugins.yaml @@ -5,4 +5,3 @@ tasks: script: .ci/scripts/create_all_plugins_app.sh - name: build all_plugins script: .ci/scripts/build_all_plugins.sh - args: ['{{env "BUILD_ALL_ARGS" "windows"}}'] diff --git a/.ci/targets/build_all_plugins_macos.yaml b/.ci/targets/build_all_plugins_macos.yaml new file mode 100644 index 000000000000..d201b59ad414 --- /dev/null +++ b/.ci/targets/build_all_plugins_macos.yaml @@ -0,0 +1,8 @@ +tasks: + - name: prepare tool + script: .ci/scripts/prepare_tool.sh + - name: create all_plugins app + script: .ci/scripts/create_all_plugins_app.sh + - name: build all_plugins + script: .ci/scripts/build_all_plugins.sh + args: ["macos"] From a6ad527415f6f3d81c7aaad630c02d1551900f44 Mon Sep 17 00:00:00 2001 From: Keyong Han Date: Fri, 4 Nov 2022 16:41:39 -0700 Subject: [PATCH 3/7] add arg for windows --- .ci/targets/build_all_plugins.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci/targets/build_all_plugins.yaml b/.ci/targets/build_all_plugins.yaml index b51a5b18dfd9..1a4886e40051 100644 --- a/.ci/targets/build_all_plugins.yaml +++ b/.ci/targets/build_all_plugins.yaml @@ -5,3 +5,4 @@ tasks: script: .ci/scripts/create_all_plugins_app.sh - name: build all_plugins script: .ci/scripts/build_all_plugins.sh + args: ["windows"] From bc44a8428443fc5c54c24e967b4ca116fffbac0d Mon Sep 17 00:00:00 2001 From: Keyong Han Date: Fri, 4 Nov 2022 16:47:22 -0700 Subject: [PATCH 4/7] add targets --- .ci.yaml | 20 +++++++++++++++++++ ..._macos.yaml => mac_build_all_plugins.yaml} | 0 2 files changed, 20 insertions(+) rename .ci/targets/{build_all_plugins_macos.yaml => mac_build_all_plugins.yaml} (100%) diff --git a/.ci.yaml b/.ci.yaml index 18525998967e..9922d3bad366 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -51,6 +51,26 @@ targets: version_file: flutter_master.version target_file: mac_lint_podspecs.yaml + - name: Mac_x64 build_all_plugins master + recipe: plugins/plugins + bringup: true # New target: https://github.com/flutter/plugins/pull/6671 + timeout: 30 + properties: + add_recipes_cq: "true" + version_file: flutter_master.version + target_file: mac_build_all_plugins.yaml + channel: master + + - name: Mac_x64 build_all_plugins stable + recipe: plugins/plugins + bringup: true # New target: https://github.com/flutter/plugins/pull/6671 + timeout: 30 + properties: + add_recipes_cq: "true" + version_file: flutter_master.version + target_file: mac_build_all_plugins.yaml + channel: stable + - name: Windows win32-platform_tests master recipe: plugins/plugins timeout: 30 diff --git a/.ci/targets/build_all_plugins_macos.yaml b/.ci/targets/mac_build_all_plugins.yaml similarity index 100% rename from .ci/targets/build_all_plugins_macos.yaml rename to .ci/targets/mac_build_all_plugins.yaml From 08e05f8761e7850cbe340c1bbb17b99bb8e81759 Mon Sep 17 00:00:00 2001 From: Keyong Han Date: Fri, 4 Nov 2022 16:59:01 -0700 Subject: [PATCH 5/7] udpate version file --- .ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci.yaml b/.ci.yaml index 9922d3bad366..e993b20d4656 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -67,7 +67,7 @@ targets: timeout: 30 properties: add_recipes_cq: "true" - version_file: flutter_master.version + version_file: flutter_stable.version target_file: mac_build_all_plugins.yaml channel: stable From 97e3c3301313200de1eac7017d14ab0a280ef1f0 Mon Sep 17 00:00:00 2001 From: Keyong Han Date: Mon, 7 Nov 2022 13:24:48 -0800 Subject: [PATCH 6/7] platform & build_mode args --- .ci/scripts/build_all_plugins.sh | 10 +++------- .ci/targets/build_all_plugins.yaml | 7 +++++-- .ci/targets/mac_build_all_plugins.yaml | 7 +++++-- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.ci/scripts/build_all_plugins.sh b/.ci/scripts/build_all_plugins.sh index 2ca0ae6de894..89dab629fd52 100644 --- a/.ci/scripts/build_all_plugins.sh +++ b/.ci/scripts/build_all_plugins.sh @@ -3,11 +3,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -arg="$1" +platform="$1" +build_mode="$2" cd all_packages -if [[ "$arg" == "web" ]]; then - echo "Skipping; web does not support debug builds" -else - flutter build "$arg" --debug - flutter build "$arg" --release -fi +flutter build "$platform" --"$build_mode" diff --git a/.ci/targets/build_all_plugins.yaml b/.ci/targets/build_all_plugins.yaml index 1a4886e40051..0ffbdfcce376 100644 --- a/.ci/targets/build_all_plugins.yaml +++ b/.ci/targets/build_all_plugins.yaml @@ -3,6 +3,9 @@ tasks: script: .ci/scripts/prepare_tool.sh - name: create all_plugins app script: .ci/scripts/create_all_plugins_app.sh - - name: build all_plugins + - name: build all_plugins debug script: .ci/scripts/build_all_plugins.sh - args: ["windows"] + args: ["windows", "debug"] + - name: build all_plugins release + script: .ci/scripts/build_all_plugins.sh + args: ["windows", "release"] diff --git a/.ci/targets/mac_build_all_plugins.yaml b/.ci/targets/mac_build_all_plugins.yaml index d201b59ad414..4dd324e8b3f0 100644 --- a/.ci/targets/mac_build_all_plugins.yaml +++ b/.ci/targets/mac_build_all_plugins.yaml @@ -3,6 +3,9 @@ tasks: script: .ci/scripts/prepare_tool.sh - name: create all_plugins app script: .ci/scripts/create_all_plugins_app.sh - - name: build all_plugins + - name: build all_plugins debug script: .ci/scripts/build_all_plugins.sh - args: ["macos"] + args: ["macos", "debug"] + - name: build all_plugins release + script: .ci/scripts/build_all_plugins.sh + args: ["macos", "release"] From 48c1e1d95f5e82aaeadf95e2da231da61bbe1a35 Mon Sep 17 00:00:00 2001 From: Keyong Han Date: Tue, 8 Nov 2022 16:16:36 -0800 Subject: [PATCH 7/7] map docs from cirrus --- .ci.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.ci.yaml b/.ci.yaml index e993b20d4656..e48175acc6a2 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -39,6 +39,7 @@ platform_properties: targets: + ### iOS+macOS tasks *** # TODO(stuartmorgan): Move this to ARM once google_maps_flutter has ARM # support. `pod lint` makes a synthetic target that doesn't respect the # pod's arch exclusions, so fails to build. @@ -51,6 +52,9 @@ targets: version_file: flutter_master.version target_file: mac_lint_podspecs.yaml + ### macOS desktop tasks ### + # macos-platform_tests builds all the plugins on M1, so this build is run + # on Intel to give us build coverage of both host types. - name: Mac_x64 build_all_plugins master recipe: plugins/plugins bringup: true # New target: https://github.com/flutter/plugins/pull/6671