From e4795ffe3db89342a0bd67e24910002dd1766e71 Mon Sep 17 00:00:00 2001 From: Keyong Han Date: Fri, 28 Oct 2022 12:50:44 -0700 Subject: [PATCH 1/8] add darwin_lint_podspecs --- .ci.yaml | 20 ++++++++++++++++++++ .ci/targets/mac_darwin_lint_podspecs.yaml | 5 +++++ 2 files changed, 25 insertions(+) create mode 100644 .ci/targets/mac_darwin_lint_podspecs.yaml diff --git a/.ci.yaml b/.ci.yaml index bc1feca37966..590e2e58f231 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -25,8 +25,28 @@ platform_properties: ] device_type: none os: Windows + mac_x64: + properties: + dependencies: >- + [ + {"dependency": "xcode", "version": "14a5294e"}, + {"dependency": "gems", "version": "v3.3.14"} + ] + os: Mac-12 + device_type: none + cpu: x86 + xcode: 14a5294e # xcode 14.0 beta 5 + targets: + - name: Mac_x64 darwin_lint_podspecs + recipe: plugins/plugins + timeout: 30 + properties: + add_recipes_cq: "true" + version_file: flutter_master.version + target_file: darwin_lint_podspecs.yaml + - name: Windows win32-platform_tests master recipe: plugins/plugins timeout: 30 diff --git a/.ci/targets/mac_darwin_lint_podspecs.yaml b/.ci/targets/mac_darwin_lint_podspecs.yaml new file mode 100644 index 000000000000..093f52ce6601 --- /dev/null +++ b/.ci/targets/mac_darwin_lint_podspecs.yaml @@ -0,0 +1,5 @@ +tasks: + - name: prepare tool + script: .ci/scripts/prepare_tool.sh + - name: create all_plugins app + script: ./script/tool_runner.sh podspecs From 52ee7bf100da82a347711ddbd41ae4666c4bb716 Mon Sep 17 00:00:00 2001 From: Keyong Han Date: Fri, 28 Oct 2022 13:01:49 -0700 Subject: [PATCH 2/8] update target file --- .ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci.yaml b/.ci.yaml index 590e2e58f231..30708e92c998 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -45,7 +45,7 @@ targets: properties: add_recipes_cq: "true" version_file: flutter_master.version - target_file: darwin_lint_podspecs.yaml + target_file: mac_darwin_lint_podspecs.yaml - name: Windows win32-platform_tests master recipe: plugins/plugins From 044f41497fe727d956744ba6e36961e593060286 Mon Sep 17 00:00:00 2001 From: Keyong Han Date: Fri, 28 Oct 2022 13:12:14 -0700 Subject: [PATCH 3/8] add args --- .ci/targets/mac_darwin_lint_podspecs.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci/targets/mac_darwin_lint_podspecs.yaml b/.ci/targets/mac_darwin_lint_podspecs.yaml index 093f52ce6601..dc3cebf806cb 100644 --- a/.ci/targets/mac_darwin_lint_podspecs.yaml +++ b/.ci/targets/mac_darwin_lint_podspecs.yaml @@ -3,3 +3,4 @@ tasks: script: .ci/scripts/prepare_tool.sh - name: create all_plugins app script: ./script/tool_runner.sh podspecs + args: podspecs From 8c5971f8f8b1fb49feb7111e6c35161798076855 Mon Sep 17 00:00:00 2001 From: Keyong Han Date: Fri, 28 Oct 2022 16:54:19 -0700 Subject: [PATCH 4/8] update path --- .ci/targets/mac_darwin_lint_podspecs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/targets/mac_darwin_lint_podspecs.yaml b/.ci/targets/mac_darwin_lint_podspecs.yaml index dc3cebf806cb..27a15e86d941 100644 --- a/.ci/targets/mac_darwin_lint_podspecs.yaml +++ b/.ci/targets/mac_darwin_lint_podspecs.yaml @@ -2,5 +2,5 @@ tasks: - name: prepare tool script: .ci/scripts/prepare_tool.sh - name: create all_plugins app - script: ./script/tool_runner.sh podspecs + script: script/tool_runner.sh podspecs args: podspecs From 81f42680e7257cb9422d53566e61e63401571915 Mon Sep 17 00:00:00 2001 From: Keyong Han Date: Fri, 28 Oct 2022 17:32:41 -0700 Subject: [PATCH 5/8] update script --- .ci/targets/mac_darwin_lint_podspecs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/targets/mac_darwin_lint_podspecs.yaml b/.ci/targets/mac_darwin_lint_podspecs.yaml index 27a15e86d941..f42842297a72 100644 --- a/.ci/targets/mac_darwin_lint_podspecs.yaml +++ b/.ci/targets/mac_darwin_lint_podspecs.yaml @@ -2,5 +2,5 @@ tasks: - name: prepare tool script: .ci/scripts/prepare_tool.sh - name: create all_plugins app - script: script/tool_runner.sh podspecs + script: script/tool_runner.sh args: podspecs From 09e267b125b04a96a9efcc965e06c379f01b001b Mon Sep 17 00:00:00 2001 From: Keyong Han Date: Mon, 31 Oct 2022 13:40:28 -0700 Subject: [PATCH 6/8] args list --- .ci/targets/mac_darwin_lint_podspecs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/targets/mac_darwin_lint_podspecs.yaml b/.ci/targets/mac_darwin_lint_podspecs.yaml index f42842297a72..b329e9e3675a 100644 --- a/.ci/targets/mac_darwin_lint_podspecs.yaml +++ b/.ci/targets/mac_darwin_lint_podspecs.yaml @@ -3,4 +3,4 @@ tasks: script: .ci/scripts/prepare_tool.sh - name: create all_plugins app script: script/tool_runner.sh - args: podspecs + args: ["podspecs"] From dfa483794e727fa4f21c81375c450868be6fd474 Mon Sep 17 00:00:00 2001 From: Keyong Han Date: Mon, 31 Oct 2022 14:23:00 -0700 Subject: [PATCH 7/8] bringup: true --- .ci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci.yaml b/.ci.yaml index 30708e92c998..a69587f09f8a 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -41,6 +41,7 @@ platform_properties: targets: - name: Mac_x64 darwin_lint_podspecs recipe: plugins/plugins + bringup: true # New target: https://github.com/flutter/plugins/pull/6637 timeout: 30 properties: add_recipes_cq: "true" From 5db5fa559e320e2922a491a52b48069b4bdc0263 Mon Sep 17 00:00:00 2001 From: Keyong Han Date: Tue, 1 Nov 2022 10:51:30 -0700 Subject: [PATCH 8/8] TODO & Name changes --- .ci.yaml | 7 +++++-- ...ac_darwin_lint_podspecs.yaml => mac_lint_podspecs.yaml} | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) rename .ci/targets/{mac_darwin_lint_podspecs.yaml => mac_lint_podspecs.yaml} (76%) diff --git a/.ci.yaml b/.ci.yaml index a69587f09f8a..18525998967e 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -39,14 +39,17 @@ platform_properties: targets: - - name: Mac_x64 darwin_lint_podspecs + # 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. + - name: Mac_x64 lint_podspecs recipe: plugins/plugins bringup: true # New target: https://github.com/flutter/plugins/pull/6637 timeout: 30 properties: add_recipes_cq: "true" version_file: flutter_master.version - target_file: mac_darwin_lint_podspecs.yaml + target_file: mac_lint_podspecs.yaml - name: Windows win32-platform_tests master recipe: plugins/plugins diff --git a/.ci/targets/mac_darwin_lint_podspecs.yaml b/.ci/targets/mac_lint_podspecs.yaml similarity index 76% rename from .ci/targets/mac_darwin_lint_podspecs.yaml rename to .ci/targets/mac_lint_podspecs.yaml index b329e9e3675a..02a904ee3d85 100644 --- a/.ci/targets/mac_darwin_lint_podspecs.yaml +++ b/.ci/targets/mac_lint_podspecs.yaml @@ -1,6 +1,6 @@ tasks: - name: prepare tool script: .ci/scripts/prepare_tool.sh - - name: create all_plugins app + - name: lint iOS and macOS podspecs script: script/tool_runner.sh args: ["podspecs"]