Skip to content

Commit 551ca3d

Browse files
SkywalkerDarrenSkywalkerDarren
authored
Merge pull request #1 from flutter/master
合并最新分支
2 parents a3accd7 + b906ea5 commit 551ca3d

File tree

2,697 files changed

+117655
-57075
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,697 files changed

+117655
-57075
lines changed

‎.ci.yaml‎

Lines changed: 104 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,111 @@
44
# for every commit.
55
#
66
# More information at:
7-
# * https://github.com/flutter/cocoon/blob/master/CI_YAML.md
7+
# * https://github.com/flutter/cocoon/blob/main/CI_YAML.md
88
enabled_branches:
9-
- master
9+
- main
10+
11+
platform_properties:
12+
linux:
13+
properties:
14+
caches: >-
15+
[
16+
]
17+
dependencies: >
18+
[
19+
{"dependency": "curl"}
20+
]
21+
device_type: none
22+
os: Linux
23+
windows:
24+
properties:
25+
caches: >-
26+
[
27+
{"name": "vsbuild", "path": "vsbuild"},
28+
{"name": "pub_cache", "path": ".pub-cache"}
29+
]
30+
dependencies: >
31+
[
32+
{"dependency": "certs"}
33+
]
34+
device_type: none
35+
os: Windows
1036

1137
targets:
12-
- name: Windows Plugins
13-
builder: Windows Plugins
14-
postsubmit: false
15-
scheduler: luci
38+
- name: Windows win32-platform_tests master
39+
recipe: plugins/plugins
40+
timeout: 30
41+
properties:
42+
add_recipes_cq: "true"
43+
target_file: windows_build_and_platform_tests.yaml
44+
channel: master
45+
version_file: flutter_master.version
46+
dependencies: >
47+
[
48+
{"dependency": "vs_build"}
49+
]
50+
51+
- name: Windows win32-platform_tests stable
52+
recipe: plugins/plugins
53+
timeout: 30
54+
properties:
55+
add_recipes_cq: "true"
56+
target_file: windows_build_and_platform_tests.yaml
57+
channel: stable
58+
dependencies: >
59+
[
60+
{"dependency": "vs_build"}
61+
]
62+
63+
- name: Windows windows-build_all_plugins master
64+
recipe: plugins/plugins
65+
timeout: 30
66+
properties:
67+
add_recipes_cq: "true"
68+
target_file: build_all_plugins.yaml
69+
channel: master
70+
version_file: flutter_master.version
71+
dependencies: >
72+
[
73+
{"dependency": "vs_build"}
74+
]
75+
76+
- name: Windows windows-build_all_plugins stable
77+
recipe: plugins/plugins
78+
timeout: 30
79+
properties:
80+
add_recipes_cq: "true"
81+
target_file: build_all_plugins.yaml
82+
channel: stable
83+
dependencies: >
84+
[
85+
{"dependency": "vs_build"}
86+
]
87+
88+
- name: Windows uwp-platform_tests master
89+
recipe: plugins/plugins
90+
timeout: 30
91+
properties:
92+
add_recipes_cq: "true"
93+
target_file: uwp_build_and_platform_tests.yaml
94+
channel: master
95+
version_file: flutter_master.version
96+
dependencies: >
97+
[
98+
{"dependency": "vs_build"}
99+
]
100+
101+
- name: Windows plugin_tools_tests
102+
recipe: plugins/plugins
103+
timeout: 30
104+
properties:
105+
add_recipes_cq: "true"
106+
target_file: plugin_tools_tests.yaml
107+
channel: master
108+
version_file: flutter_master.version
16109

110+
- name: Linux ci_yaml plugins roller
111+
recipe: infra/ci_yaml
112+
timeout: 30
113+
runIf:
114+
- .ci.yaml

‎.ci/Dockerfile‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
# The Flutter version is not important here, since the CI scripts update Flutter
22
# before running. What matters is that the base image is pinned to minimize
33
# unintended changes when modifying this file.
4-
FROM cirrusci/flutter:2.2.2
4+
FROM cirrusci/flutter:2.8.0
55

66
RUN apt-get update -y
77

8-
# Required by Roboeletric and the Android SDK.
9-
RUN apt-get install -y openjdk-8-jdk
10-
ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
11-
128
RUN apt-get install -y --no-install-recommends gnupg
139

1410
# Add repo for gcloud sdk and install it
@@ -45,6 +41,7 @@ RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo ap
4541
RUN echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main' | sudo tee /etc/apt/sources.list.d/google-chrome.list
4642
RUN apt-get update && apt-get install -y --no-install-recommends google-chrome-stable
4743

48-
# Make Chrome the default so http: has a handler for url_launcher tests.
44+
# Make Chrome the default so http: and file: has a handler for url_launcher tests.
4945
RUN apt-get install -y xdg-utils
5046
RUN xdg-settings set default-web-browser google-chrome.desktop
47+
RUN xdg-mime default google-chrome.desktop inode/directory

‎.ci/flutter_master.version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
a491a81f78739dc1c801529b98239adc6a2dd361

‎.ci/java8.Dockerfile‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎.ci/scripts/build_all_plugins.sh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/bash
2+
# Copyright 2013 The Flutter Authors. All rights reserved.
3+
# Use of this source code is governed by a BSD-style license that can be
4+
# found in the LICENSE file.
5+
6+
cd all_plugins
7+
flutter build windows --debug
8+
flutter build windows --release

‎.ci/scripts/build_examples_uwp.sh‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
# Copyright 2013 The Flutter Authors. All rights reserved.
3+
# Use of this source code is governed by a BSD-style license that can be
4+
# found in the LICENSE file.
5+
6+
dart ./script/tool/bin/flutter_plugin_tools.dart build-examples --winuwp \
7+
--packages-for-branch --log-timing

‎.ci/scripts/build_examples_win32.sh‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
# Copyright 2013 The Flutter Authors. All rights reserved.
3+
# Use of this source code is governed by a BSD-style license that can be
4+
# found in the LICENSE file.
5+
6+
dart ./script/tool/bin/flutter_plugin_tools.dart build-examples --windows \
7+
--packages-for-branch --log-timing

‎.ci/scripts/create_all_plugins_app.sh‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
# Copyright 2013 The Flutter Authors. All rights reserved.
3+
# Use of this source code is governed by a BSD-style license that can be
4+
# found in the LICENSE file.
5+
6+
dart ./script/tool/bin/flutter_plugin_tools.dart all-plugins-app \
7+
--output-dir=. --exclude script/configs/exclude_all_plugins_app.yaml

‎.ci/scripts/drive_examples_win32.sh‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
# Copyright 2013 The Flutter Authors. All rights reserved.
3+
# Use of this source code is governed by a BSD-style license that can be
4+
# found in the LICENSE file.
5+
6+
dart ./script/tool/bin/flutter_plugin_tools.dart drive-examples --windows \
7+
--exclude=script/configs/exclude_integration_win32.yaml --packages-for-branch --log-timing

‎.ci/scripts/native_test_win32.sh‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
# Copyright 2013 The Flutter Authors. All rights reserved.
3+
# Use of this source code is governed by a BSD-style license that can be
4+
# found in the LICENSE file.
5+
6+
dart ./script/tool/bin/flutter_plugin_tools.dart native-test --windows \
7+
--no-integration --packages-for-branch --log-timing

0 commit comments

Comments
 (0)