From a0578857dca2a042c87bac754d87c1c77e6a020e Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Fri, 3 Sep 2021 16:07:23 -0400 Subject: [PATCH 1/6] Bring up new Windows test targets Uses the new generic plugins recipe to add a number of new Windows tests that have recently gained tool support, but not yet added to the LUCI builds: - New targets: - The "build all plugins" test (master and stable) - UWP build tests (master only, since UWP is not on stable yet) - Tool tests (master only with existing tool tests on Linux) - Replacement versions of the existing builders but with names that match the Cirrus naming to make the parallels in testing easier to understand in the GitHub UI and configs. - Modification of existing targets: - Adds Windows native unit tests to the existing script. --- .ci.yaml | 84 +++++++++++++++++++ .ci/scripts/build_all_plugins.sh | 8 ++ .ci/scripts/build_examples_uwp.sh | 7 ++ .ci/scripts/create_all_plugins_app.sh | 7 ++ .ci/scripts/native_test_win32.sh | 7 ++ .ci/scripts/plugin_tools_tests.sh | 7 ++ .ci/targets/build_all_plugins.yaml | 7 ++ .ci/targets/plugin_tools_tests.yaml | 5 ++ .ci/targets/uwp_build_and_platform_tests.yaml | 5 ++ .../windows_build_and_platform_tests.yaml | 7 +- .cirrus.yml | 2 +- 11 files changed, 142 insertions(+), 4 deletions(-) create mode 100644 .ci/scripts/build_all_plugins.sh create mode 100644 .ci/scripts/build_examples_uwp.sh create mode 100644 .ci/scripts/create_all_plugins_app.sh create mode 100644 .ci/scripts/native_test_win32.sh create mode 100644 .ci/scripts/plugin_tools_tests.sh create mode 100644 .ci/targets/build_all_plugins.yaml create mode 100644 .ci/targets/plugin_tools_tests.yaml create mode 100644 .ci/targets/uwp_build_and_platform_tests.yaml diff --git a/.ci.yaml b/.ci.yaml index ebedd203b3ca..a4b2009ca8d3 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -35,6 +35,7 @@ platform_properties: os: Windows targets: + # TODO(stuartmorgan) Remove once the renamed version below has propagated. - name: Windows Plugins master channel recipe: plugins/plugins timeout: 30 @@ -47,6 +48,7 @@ targets: ] scheduler: luci + # TODO(stuartmorgan) Remove once the renamed version below has propagated. - name: Windows Plugins stable channel recipe: plugins/plugins timeout: 30 @@ -60,6 +62,88 @@ targets: ] scheduler: luci + - name: windows-build+platform-tests master + recipe: plugins/plugins + bringup: true + timeout: 30 + properties: + # TODO(stuartmorgan): Uncomment when removing bringup. + #add_recipes_cq: "true" + target_file: windows_build_and_platform_tests.yaml + dependencies: > + [ + {"dependency": "vs_build"} + ] + scheduler: luci + + - name: windows-build+platform-tests stable + recipe: plugins/plugins + bringup: true + timeout: 30 + properties: + # TODO(stuartmorgan): Uncomment when removing bringup. + #add_recipes_cq: "true" + target_file: uwp_build_and_platform_tests.yaml + channel: stable + dependencies: > + [ + {"dependency": "vs_build"} + ] + scheduler: luci + + - name: build_all_plugins_windows master + recipe: plugins/plugins + bringup: true + timeout: 30 + properties: + # TODO(stuartmorgan): Uncomment when removing bringup. + #add_recipes_cq: "true" + target_file: build_all_plugins.yaml + dependencies: > + [ + {"dependency": "vs_build"} + ] + scheduler: luci + + - name: build_all_plugins_windows stable + recipe: plugins/plugins + bringup: true + timeout: 30 + properties: + # TODO(stuartmorgan): Uncomment when removing bringup. + #add_recipes_cq: "true" + target_file: build_all_plugins.yaml + channel: stable + dependencies: > + [ + {"dependency": "vs_build"} + ] + scheduler: luci + + - name: uwp-build+platform-tests master + recipe: plugins/plugins + bringup: true + timeout: 30 + properties: + # TODO(stuartmorgan): Uncomment when removing bringup. + #add_recipes_cq: "true" + target_file: uwp_build_and_platform_tests.yaml + dependencies: > + [ + {"dependency": "vs_build"} + ] + scheduler: luci + + - name: plugin_tools_tests - Windows + recipe: plugins/plugins + bringup: true + timeout: 30 + properties: + # TODO(stuartmorgan): Uncomment when removing bringup. + #add_recipes_cq: "true" + target_file: plugin_tools_tests.yaml + scheduler: luci + - name: Linux ci_yaml plugins roller recipe: infra/ci_yaml timeout: 30 diff --git a/.ci/scripts/build_all_plugins.sh b/.ci/scripts/build_all_plugins.sh new file mode 100644 index 000000000000..008dea7c5e13 --- /dev/null +++ b/.ci/scripts/build_all_plugins.sh @@ -0,0 +1,8 @@ +#!/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. + +cd all_plugins +flutter build windows --debug +flutter build windows --release diff --git a/.ci/scripts/build_examples_uwp.sh b/.ci/scripts/build_examples_uwp.sh new file mode 100644 index 000000000000..639cb054e4b7 --- /dev/null +++ b/.ci/scripts/build_examples_uwp.sh @@ -0,0 +1,7 @@ +#!/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. + +dart ./script/tool/bin/flutter_plugin_tools.dart build-examples --winuwp \ + --packages-for-branch diff --git a/.ci/scripts/create_all_plugins_app.sh b/.ci/scripts/create_all_plugins_app.sh new file mode 100644 index 000000000000..196fef9b06c9 --- /dev/null +++ b/.ci/scripts/create_all_plugins_app.sh @@ -0,0 +1,7 @@ +#!/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. + +dart ./script/tool/bin/flutter_plugin_tools.dart all-plugins-app \ + --output-dir=. --exclude script/configs/exclude_all_plugins_app.yaml diff --git a/.ci/scripts/native_test_win32.sh b/.ci/scripts/native_test_win32.sh new file mode 100644 index 000000000000..938515784412 --- /dev/null +++ b/.ci/scripts/native_test_win32.sh @@ -0,0 +1,7 @@ +#!/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. + +dart ./script/tool/bin/flutter_plugin_tools.dart native-test --windows \ + --no-integration --packages-for-branch diff --git a/.ci/scripts/plugin_tools_tests.sh b/.ci/scripts/plugin_tools_tests.sh new file mode 100644 index 000000000000..96eec4349f08 --- /dev/null +++ b/.ci/scripts/plugin_tools_tests.sh @@ -0,0 +1,7 @@ +#!/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. + +cd script/tool +dart pub run test diff --git a/.ci/targets/build_all_plugins.yaml b/.ci/targets/build_all_plugins.yaml new file mode 100644 index 000000000000..31ae9e1e8165 --- /dev/null +++ b/.ci/targets/build_all_plugins.yaml @@ -0,0 +1,7 @@ +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 diff --git a/.ci/targets/plugin_tools_tests.yaml b/.ci/targets/plugin_tools_tests.yaml new file mode 100644 index 000000000000..4563711f6904 --- /dev/null +++ b/.ci/targets/plugin_tools_tests.yaml @@ -0,0 +1,5 @@ +tasks: + - name: "prepare tool" + script: .ci/scripts/prepare_tool.sh + - name: "tool unit tests" + script: .ci/scripts/plugin_tools_tests.sh diff --git a/.ci/targets/uwp_build_and_platform_tests.yaml b/.ci/targets/uwp_build_and_platform_tests.yaml new file mode 100644 index 000000000000..179b898c649d --- /dev/null +++ b/.ci/targets/uwp_build_and_platform_tests.yaml @@ -0,0 +1,5 @@ +tasks: + - name: "prepare tool" + script: .ci/scripts/prepare_tool.sh + - name: "build examples (UWP)" + script: .ci/scripts/build_examples_uwp.sh diff --git a/.ci/targets/windows_build_and_platform_tests.yaml b/.ci/targets/windows_build_and_platform_tests.yaml index cba120073310..fb5aa5f9e953 100644 --- a/.ci/targets/windows_build_and_platform_tests.yaml +++ b/.ci/targets/windows_build_and_platform_tests.yaml @@ -1,8 +1,9 @@ - tasks: - name: "prepare tool" script: .ci/scripts/prepare_tool.sh - - name: "build examples" + - name: "build examples (Win32)" script: .ci/scripts/build_examples_win32.sh - - name: "drive examples" + - name: "native unit tests (Win32)" + script: .ci/scripts/native_test_win32.sh + - name: "drive examples (Win32)" script: .ci/scripts/drive_examples_win32.sh diff --git a/.cirrus.yml b/.cirrus.yml index 10d668d8d1d7..56f312dea929 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -66,7 +66,7 @@ task: - name: plugin_tools_tests script: - cd script/tool - - CIRRUS_BUILD_ID=null pub run test + - dart pub run test - name: publishable version_check_script: ./script/tool_runner.sh version-check publish_check_script: ./script/tool_runner.sh publish-check From a050e419f5460be3bfbc6d4f45dd36fb2f6f8443 Mon Sep 17 00:00:00 2001 From: stuartmorgan Date: Fri, 3 Sep 2021 19:45:36 -0700 Subject: [PATCH 2/6] Adjust names --- .ci.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index a4b2009ca8d3..a63f149403d9 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -62,7 +62,7 @@ targets: ] scheduler: luci - - name: windows-build+platform-tests master + - name: Windows win32_build+platform-tests master recipe: plugins/plugins bringup: true timeout: 30 @@ -76,7 +76,7 @@ targets: ] scheduler: luci - - name: windows-build+platform-tests stable + - name: Windows win32_build+platform-tests stable recipe: plugins/plugins bringup: true timeout: 30 @@ -91,7 +91,7 @@ targets: ] scheduler: luci - - name: build_all_plugins_windows master + - name: Windows build_all_plugins master recipe: plugins/plugins bringup: true timeout: 30 @@ -105,7 +105,7 @@ targets: ] scheduler: luci - - name: build_all_plugins_windows stable + - name: Windows build_all_plugins stable recipe: plugins/plugins bringup: true timeout: 30 @@ -120,7 +120,7 @@ targets: ] scheduler: luci - - name: uwp-build+platform-tests master + - name: Windows uwp-build+platform-tests master recipe: plugins/plugins bringup: true timeout: 30 @@ -134,7 +134,7 @@ targets: ] scheduler: luci - - name: plugin_tools_tests - Windows + - name: Windows plugin_tools_tests recipe: plugins/plugins bringup: true timeout: 30 From 089d127331f8e9c650668f20679e42210ad58cc6 Mon Sep 17 00:00:00 2001 From: stuartmorgan Date: Fri, 3 Sep 2021 19:49:06 -0700 Subject: [PATCH 3/6] Remove quotes. --- .ci/targets/windows_build_and_platform_tests.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci/targets/windows_build_and_platform_tests.yaml b/.ci/targets/windows_build_and_platform_tests.yaml index fb5aa5f9e953..cda3e57f75d2 100644 --- a/.ci/targets/windows_build_and_platform_tests.yaml +++ b/.ci/targets/windows_build_and_platform_tests.yaml @@ -1,9 +1,9 @@ tasks: - - name: "prepare tool" + - name: prepare tool script: .ci/scripts/prepare_tool.sh - - name: "build examples (Win32)" + - name: build examples (Win32) script: .ci/scripts/build_examples_win32.sh - - name: "native unit tests (Win32)" + - name: native unit tests (Win32) script: .ci/scripts/native_test_win32.sh - - name: "drive examples (Win32)" + - name: drive examples (Win32) script: .ci/scripts/drive_examples_win32.sh From 46e1b7906c4c17731b432fd5a16a7761c98d5bec Mon Sep 17 00:00:00 2001 From: stuartmorgan Date: Fri, 3 Sep 2021 19:49:43 -0700 Subject: [PATCH 4/6] Remove quotes --- .ci/targets/build_all_plugins.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci/targets/build_all_plugins.yaml b/.ci/targets/build_all_plugins.yaml index 31ae9e1e8165..b51a5b18dfd9 100644 --- a/.ci/targets/build_all_plugins.yaml +++ b/.ci/targets/build_all_plugins.yaml @@ -1,7 +1,7 @@ tasks: - - name: "prepare tool" + - name: prepare tool script: .ci/scripts/prepare_tool.sh - - name: "create all_plugins app" + - name: create all_plugins app script: .ci/scripts/create_all_plugins_app.sh - - name: "build all_plugins" + - name: build all_plugins script: .ci/scripts/build_all_plugins.sh From cea3b78f705868abb1f78ebfd30dc52e429e5d7f Mon Sep 17 00:00:00 2001 From: stuartmorgan Date: Fri, 3 Sep 2021 19:49:59 -0700 Subject: [PATCH 5/6] Remove quotes --- .ci/targets/plugin_tools_tests.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/targets/plugin_tools_tests.yaml b/.ci/targets/plugin_tools_tests.yaml index 4563711f6904..265e74bdd06b 100644 --- a/.ci/targets/plugin_tools_tests.yaml +++ b/.ci/targets/plugin_tools_tests.yaml @@ -1,5 +1,5 @@ tasks: - - name: "prepare tool" + - name: prepare tool script: .ci/scripts/prepare_tool.sh - - name: "tool unit tests" + - name: tool unit tests script: .ci/scripts/plugin_tools_tests.sh From f2e69d5f2c8d91e68e5437cf04e202ff06b19e76 Mon Sep 17 00:00:00 2001 From: stuartmorgan Date: Fri, 3 Sep 2021 19:50:45 -0700 Subject: [PATCH 6/6] Remove quotes --- .ci/targets/uwp_build_and_platform_tests.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/targets/uwp_build_and_platform_tests.yaml b/.ci/targets/uwp_build_and_platform_tests.yaml index 179b898c649d..a7f070776ff1 100644 --- a/.ci/targets/uwp_build_and_platform_tests.yaml +++ b/.ci/targets/uwp_build_and_platform_tests.yaml @@ -1,5 +1,5 @@ tasks: - - name: "prepare tool" + - name: prepare tool script: .ci/scripts/prepare_tool.sh - - name: "build examples (UWP)" + - name: build examples (UWP) script: .ci/scripts/build_examples_uwp.sh