[ci] Enable the new Windows targets (flutter#4325)

Now that the builders have propagated, enable all the new tests and remove the obsolete versions.
amantoux · Sep 27, 2021 · eb7ff6b · eb7ff6b
1 parent dee47b0
commit eb7ff6b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 46 deletions.
diff --git a/.ci.yaml b/.ci.yaml
@@ -35,40 +35,11 @@ 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
-    properties:
-      add_recipes_cq: "true"
-      target_file: windows_build_and_platform_tests.yaml
-      dependencies: >
-        [
-          {"dependency": "vs_build"}
-        ]
-    scheduler: luci
-
-  # TODO(stuartmorgan) Remove once the renamed version below has propagated.
-  - name: Windows Plugins stable channel
-    recipe: plugins/plugins
-    timeout: 30
-    properties:
-      add_recipes_cq: "true"
-      target_file: windows_build_and_platform_tests.yaml
-      channel: stable
-      dependencies: >
-        [
-          {"dependency": "vs_build"}
-        ]
-    scheduler: luci
-
   - name: Windows win32-platform_tests master
     recipe: plugins/plugins
-    bringup: true
     timeout: 30
     properties:
-      # TODO(stuartmorgan): Uncomment when removing bringup.
-      #add_recipes_cq: "true"
+      add_recipes_cq: "true"
       target_file: windows_build_and_platform_tests.yaml
       dependencies: >
         [
@@ -78,11 +49,9 @@ targets:
 
   - name: Windows win32-platform_tests stable
     recipe: plugins/plugins
-    bringup: true
     timeout: 30
     properties:
-      # TODO(stuartmorgan): Uncomment when removing bringup.
-      #add_recipes_cq: "true"
+      add_recipes_cq: "true"
       target_file: windows_build_and_platform_tests.yaml
       channel: stable
       dependencies: >
@@ -93,11 +62,9 @@ targets:
 
   - name: Windows windows-build_all_plugins master
     recipe: plugins/plugins
-    bringup: true
     timeout: 30
     properties:
-      # TODO(stuartmorgan): Uncomment when removing bringup.
-      #add_recipes_cq: "true"
+      add_recipes_cq: "true"
       target_file: build_all_plugins.yaml
       dependencies: >
         [
@@ -107,11 +74,9 @@ targets:
 
   - name: Windows windows-build_all_plugins stable
     recipe: plugins/plugins
-    bringup: true
     timeout: 30
     properties:
-      # TODO(stuartmorgan): Uncomment when removing bringup.
-      #add_recipes_cq: "true"
+      add_recipes_cq: "true"
       target_file: build_all_plugins.yaml
       channel: stable
       dependencies: >
@@ -122,11 +87,9 @@ targets:
 
   - name: Windows uwp-platform_tests master
     recipe: plugins/plugins
-    bringup: true
     timeout: 30
     properties:
-      # TODO(stuartmorgan): Uncomment when removing bringup.
-      #add_recipes_cq: "true"
+      add_recipes_cq: "true"
       target_file: uwp_build_and_platform_tests.yaml
       dependencies: >
         [
@@ -136,11 +99,9 @@ targets:
 
   - name: Windows plugin_tools_tests
     recipe: plugins/plugins
-    bringup: true
     timeout: 30
     properties:
-      # TODO(stuartmorgan): Uncomment when removing bringup.
-      #add_recipes_cq: "true"
+      add_recipes_cq: "true"
       target_file: plugin_tools_tests.yaml
     scheduler: luci
 

diff --git a/script/tool/test/drive_examples_command_test.dart b/script/tool/test/drive_examples_command_test.dart
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:convert';
 import 'dart:io' as io;
 
 import 'package:args/command_runner.dart';
@@ -60,7 +61,8 @@ void main() {
       final String output =
           '''${includeBanner ? updateBanner : ''}[${devices.join(',')}]''';
 
-      final MockProcess mockDevicesProcess = MockProcess(stdout: output);
+      final MockProcess mockDevicesProcess =
+          MockProcess(stdout: output, stdoutEncoding: utf8);
       processRunner
               .mockProcessesForExecutable[getFlutterCommand(mockPlatform)] =
           <io.Process>[mockDevicesProcess];