Skip to content

Commit f460b79

Browse files
[ci] Enable the new Windows targets (flutter#4325)
Now that the builders have propagated, enable all the new tests and remove the obsolete versions.
1 parent f988f61 commit f460b79

File tree

2 files changed

+9
-46
lines changed

2 files changed

+9
-46
lines changed

.ci.yaml

+6-45
Original file line numberDiff line numberDiff line change
@@ -35,40 +35,11 @@ platform_properties:
3535
os: Windows
3636

3737
targets:
38-
# TODO(stuartmorgan) Remove once the renamed version below has propagated.
39-
- name: Windows Plugins master channel
40-
recipe: plugins/plugins
41-
timeout: 30
42-
properties:
43-
add_recipes_cq: "true"
44-
target_file: windows_build_and_platform_tests.yaml
45-
dependencies: >
46-
[
47-
{"dependency": "vs_build"}
48-
]
49-
scheduler: luci
50-
51-
# TODO(stuartmorgan) Remove once the renamed version below has propagated.
52-
- name: Windows Plugins stable channel
53-
recipe: plugins/plugins
54-
timeout: 30
55-
properties:
56-
add_recipes_cq: "true"
57-
target_file: windows_build_and_platform_tests.yaml
58-
channel: stable
59-
dependencies: >
60-
[
61-
{"dependency": "vs_build"}
62-
]
63-
scheduler: luci
64-
6538
- name: Windows win32-platform_tests master
6639
recipe: plugins/plugins
67-
bringup: true
6840
timeout: 30
6941
properties:
70-
# TODO(stuartmorgan): Uncomment when removing bringup.
71-
#add_recipes_cq: "true"
42+
add_recipes_cq: "true"
7243
target_file: windows_build_and_platform_tests.yaml
7344
dependencies: >
7445
[
@@ -78,11 +49,9 @@ targets:
7849

7950
- name: Windows win32-platform_tests stable
8051
recipe: plugins/plugins
81-
bringup: true
8252
timeout: 30
8353
properties:
84-
# TODO(stuartmorgan): Uncomment when removing bringup.
85-
#add_recipes_cq: "true"
54+
add_recipes_cq: "true"
8655
target_file: windows_build_and_platform_tests.yaml
8756
channel: stable
8857
dependencies: >
@@ -93,11 +62,9 @@ targets:
9362

9463
- name: Windows windows-build_all_plugins master
9564
recipe: plugins/plugins
96-
bringup: true
9765
timeout: 30
9866
properties:
99-
# TODO(stuartmorgan): Uncomment when removing bringup.
100-
#add_recipes_cq: "true"
67+
add_recipes_cq: "true"
10168
target_file: build_all_plugins.yaml
10269
dependencies: >
10370
[
@@ -107,11 +74,9 @@ targets:
10774

10875
- name: Windows windows-build_all_plugins stable
10976
recipe: plugins/plugins
110-
bringup: true
11177
timeout: 30
11278
properties:
113-
# TODO(stuartmorgan): Uncomment when removing bringup.
114-
#add_recipes_cq: "true"
79+
add_recipes_cq: "true"
11580
target_file: build_all_plugins.yaml
11681
channel: stable
11782
dependencies: >
@@ -122,11 +87,9 @@ targets:
12287

12388
- name: Windows uwp-platform_tests master
12489
recipe: plugins/plugins
125-
bringup: true
12690
timeout: 30
12791
properties:
128-
# TODO(stuartmorgan): Uncomment when removing bringup.
129-
#add_recipes_cq: "true"
92+
add_recipes_cq: "true"
13093
target_file: uwp_build_and_platform_tests.yaml
13194
dependencies: >
13295
[
@@ -136,11 +99,9 @@ targets:
13699

137100
- name: Windows plugin_tools_tests
138101
recipe: plugins/plugins
139-
bringup: true
140102
timeout: 30
141103
properties:
142-
# TODO(stuartmorgan): Uncomment when removing bringup.
143-
#add_recipes_cq: "true"
104+
add_recipes_cq: "true"
144105
target_file: plugin_tools_tests.yaml
145106
scheduler: luci
146107

script/tool/test/drive_examples_command_test.dart

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
import 'dart:convert';
56
import 'dart:io' as io;
67

78
import 'package:args/command_runner.dart';
@@ -60,7 +61,8 @@ void main() {
6061
final String output =
6162
'''${includeBanner ? updateBanner : ''}[${devices.join(',')}]''';
6263

63-
final MockProcess mockDevicesProcess = MockProcess(stdout: output);
64+
final MockProcess mockDevicesProcess =
65+
MockProcess(stdout: output, stdoutEncoding: utf8);
6466
processRunner
6567
.mockProcessesForExecutable[getFlutterCommand(mockPlatform)] =
6668
<io.Process>[mockDevicesProcess];

0 commit comments

Comments
 (0)