From 77171dcc87b787202d46735ad2231bbd069cda9e Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Wed, 1 Sep 2021 16:29:57 -0400 Subject: [PATCH 1/3] Add scripts for Windows LUCI recipe See https://github.com/flutter/flutter/issues/89373 for context. This sets up the script and config file to replicate the current plugins.py recipe's behavior using the planned generic recipe. These are currently unused, but are being landed first so that the generic recipe has something to test against. Part of https://github.com/flutter/flutter/issues/89373 --- .ci/scripts/build_examples_win32.sh | 6 ++++++ .ci/scripts/drive_examples_win32.sh | 6 ++++++ .ci/scripts/prepare_tool.sh | 10 ++++++++++ .ci/targets/windows_build_and_platform_tests.yaml | 8 ++++++++ 4 files changed, 30 insertions(+) create mode 100644 .ci/scripts/build_examples_win32.sh create mode 100644 .ci/scripts/drive_examples_win32.sh create mode 100644 .ci/scripts/prepare_tool.sh create mode 100644 .ci/targets/windows_build_and_platform_tests.yaml diff --git a/.ci/scripts/build_examples_win32.sh b/.ci/scripts/build_examples_win32.sh new file mode 100644 index 000000000000..b7f5de12c955 --- /dev/null +++ b/.ci/scripts/build_examples_win32.sh @@ -0,0 +1,6 @@ +#!/bin/bash +# Copyright 2013 The Flutter Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +./script/tool_runner.sh build-examples --windows diff --git a/.ci/scripts/drive_examples_win32.sh b/.ci/scripts/drive_examples_win32.sh new file mode 100644 index 000000000000..5fa249183941 --- /dev/null +++ b/.ci/scripts/drive_examples_win32.sh @@ -0,0 +1,6 @@ +#!/bin/bash +# Copyright 2013 The Flutter Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +./script/tool_runner.sh drive-examples --windows diff --git a/.ci/scripts/prepare_tool.sh b/.ci/scripts/prepare_tool.sh new file mode 100644 index 000000000000..1095e2189a36 --- /dev/null +++ b/.ci/scripts/prepare_tool.sh @@ -0,0 +1,10 @@ +#!/bin/bash +# Copyright 2013 The Flutter Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# To set FETCH_HEAD for "git merge-base" to work +git fetch origin master + +cd script/tool +dart pub get diff --git a/.ci/targets/windows_build_and_platform_tests.yaml b/.ci/targets/windows_build_and_platform_tests.yaml new file mode 100644 index 000000000000..cba120073310 --- /dev/null +++ b/.ci/targets/windows_build_and_platform_tests.yaml @@ -0,0 +1,8 @@ + +tasks: + - name: "prepare tool" + script: .ci/scripts/prepare_tool.sh + - name: "build examples" + script: .ci/scripts/build_examples_win32.sh + - name: "drive examples" + script: .ci/scripts/drive_examples_win32.sh From 92fc2709191d4ef8bbd9efbbef8d31c74e0a06cc Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Thu, 2 Sep 2021 12:11:35 -0400 Subject: [PATCH 2/3] Add property to builders --- .ci.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.ci.yaml b/.ci.yaml index 6b5c385aa98e..460badfbdf12 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -39,6 +39,7 @@ targets: recipe: plugins/plugins timeout: 30 properties: + target_file: windows_build_and_platform_tests.yaml dependencies: > [ {"dependency": "vs_build"} @@ -49,6 +50,7 @@ targets: recipe: plugins/plugins timeout: 30 properties: + target_file: windows_build_and_platform_tests.yaml channel: stable dependencies: > [ From e0f8865324de3c82e8d71d8c377c7f103c03858d Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Thu, 2 Sep 2021 12:16:15 -0400 Subject: [PATCH 3/3] Bypass tool_runner --- .ci/scripts/build_examples_win32.sh | 3 ++- .ci/scripts/drive_examples_win32.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.ci/scripts/build_examples_win32.sh b/.ci/scripts/build_examples_win32.sh index b7f5de12c955..8c090f4b78d2 100644 --- a/.ci/scripts/build_examples_win32.sh +++ b/.ci/scripts/build_examples_win32.sh @@ -3,4 +3,5 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -./script/tool_runner.sh build-examples --windows +dart ./script/tool/bin/flutter_plugin_tools.dart build-examples --windows \ + --packages-for-branch diff --git a/.ci/scripts/drive_examples_win32.sh b/.ci/scripts/drive_examples_win32.sh index 5fa249183941..63abc06bec5a 100644 --- a/.ci/scripts/drive_examples_win32.sh +++ b/.ci/scripts/drive_examples_win32.sh @@ -3,4 +3,5 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -./script/tool_runner.sh drive-examples --windows +dart ./script/tool/bin/flutter_plugin_tools.dart drive-examples --windows \ + --packages-for-branch