Skip to content

Commit

Permalink
Merge pull request #1 from flutter/master
Browse files Browse the repository at this point in the history
合并最新分支
  • Loading branch information
SkywalkerDarren authored Mar 8, 2022
2 parents a3accd7 + b906ea5 commit 551ca3d
Show file tree
Hide file tree
Showing 2,697 changed files with 117,655 additions and 57,075 deletions.
110 changes: 104 additions & 6 deletions .ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,111 @@
# for every commit.
#
# More information at:
# * https://github.com/flutter/cocoon/blob/master/CI_YAML.md
# * https://github.com/flutter/cocoon/blob/main/CI_YAML.md
enabled_branches:
- master
- main

platform_properties:
linux:
properties:
caches: >-
[
]
dependencies: >
[
{"dependency": "curl"}
]
device_type: none
os: Linux
windows:
properties:
caches: >-
[
{"name": "vsbuild", "path": "vsbuild"},
{"name": "pub_cache", "path": ".pub-cache"}
]
dependencies: >
[
{"dependency": "certs"}
]
device_type: none
os: Windows

targets:
- name: Windows Plugins
builder: Windows Plugins
postsubmit: false
scheduler: luci
- name: Windows win32-platform_tests master
recipe: plugins/plugins
timeout: 30
properties:
add_recipes_cq: "true"
target_file: windows_build_and_platform_tests.yaml
channel: master
version_file: flutter_master.version
dependencies: >
[
{"dependency": "vs_build"}
]
- name: Windows win32-platform_tests stable
recipe: plugins/plugins
timeout: 30
properties:
add_recipes_cq: "true"
target_file: windows_build_and_platform_tests.yaml
channel: stable
dependencies: >
[
{"dependency": "vs_build"}
]
- name: Windows windows-build_all_plugins master
recipe: plugins/plugins
timeout: 30
properties:
add_recipes_cq: "true"
target_file: build_all_plugins.yaml
channel: master
version_file: flutter_master.version
dependencies: >
[
{"dependency": "vs_build"}
]
- name: Windows windows-build_all_plugins stable
recipe: plugins/plugins
timeout: 30
properties:
add_recipes_cq: "true"
target_file: build_all_plugins.yaml
channel: stable
dependencies: >
[
{"dependency": "vs_build"}
]
- name: Windows uwp-platform_tests master
recipe: plugins/plugins
timeout: 30
properties:
add_recipes_cq: "true"
target_file: uwp_build_and_platform_tests.yaml
channel: master
version_file: flutter_master.version
dependencies: >
[
{"dependency": "vs_build"}
]
- name: Windows plugin_tools_tests
recipe: plugins/plugins
timeout: 30
properties:
add_recipes_cq: "true"
target_file: plugin_tools_tests.yaml
channel: master
version_file: flutter_master.version

- name: Linux ci_yaml plugins roller
recipe: infra/ci_yaml
timeout: 30
runIf:
- .ci.yaml
9 changes: 3 additions & 6 deletions .ci/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
# The Flutter version is not important here, since the CI scripts update Flutter
# before running. What matters is that the base image is pinned to minimize
# unintended changes when modifying this file.
FROM cirrusci/flutter:2.2.2
FROM cirrusci/flutter:2.8.0

RUN apt-get update -y

# Required by Roboeletric and the Android SDK.
RUN apt-get install -y openjdk-8-jdk
ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64

RUN apt-get install -y --no-install-recommends gnupg

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

# Make Chrome the default so http: has a handler for url_launcher tests.
# Make Chrome the default so http: and file: has a handler for url_launcher tests.
RUN apt-get install -y xdg-utils
RUN xdg-settings set default-web-browser google-chrome.desktop
RUN xdg-mime default google-chrome.desktop inode/directory
1 change: 1 addition & 0 deletions .ci/flutter_master.version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a491a81f78739dc1c801529b98239adc6a2dd361
33 changes: 0 additions & 33 deletions .ci/java8.Dockerfile

This file was deleted.

8 changes: 8 additions & 0 deletions .ci/scripts/build_all_plugins.sh
Original file line number Diff line number Diff line change
@@ -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
7 changes: 7 additions & 0 deletions .ci/scripts/build_examples_uwp.sh
Original file line number Diff line number Diff line change
@@ -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 --log-timing
7 changes: 7 additions & 0 deletions .ci/scripts/build_examples_win32.sh
Original file line number Diff line number Diff line change
@@ -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 --windows \
--packages-for-branch --log-timing
7 changes: 7 additions & 0 deletions .ci/scripts/create_all_plugins_app.sh
Original file line number Diff line number Diff line change
@@ -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
7 changes: 7 additions & 0 deletions .ci/scripts/drive_examples_win32.sh
Original file line number Diff line number Diff line change
@@ -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 drive-examples --windows \
--exclude=script/configs/exclude_integration_win32.yaml --packages-for-branch --log-timing
7 changes: 7 additions & 0 deletions .ci/scripts/native_test_win32.sh
Original file line number Diff line number Diff line change
@@ -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 --log-timing
7 changes: 7 additions & 0 deletions .ci/scripts/plugin_tools_tests.sh
Original file line number Diff line number Diff line change
@@ -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
10 changes: 10 additions & 0 deletions .ci/scripts/prepare_tool.sh
Original file line number Diff line number Diff line change
@@ -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
7 changes: 7 additions & 0 deletions .ci/targets/build_all_plugins.yaml
Original file line number Diff line number Diff line change
@@ -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
5 changes: 5 additions & 0 deletions .ci/targets/plugin_tools_tests.yaml
Original file line number Diff line number Diff line change
@@ -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
5 changes: 5 additions & 0 deletions .ci/targets/uwp_build_and_platform_tests.yaml
Original file line number Diff line number Diff line change
@@ -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
9 changes: 9 additions & 0 deletions .ci/targets/windows_build_and_platform_tests.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
tasks:
- name: prepare tool
script: .ci/scripts/prepare_tool.sh
- name: build examples (Win32)
script: .ci/scripts/build_examples_win32.sh
- name: native unit tests (Win32)
script: .ci/scripts/native_test_win32.sh
- name: drive examples (Win32)
script: .ci/scripts/drive_examples_win32.sh
Loading

0 comments on commit 551ca3d

Please sign in to comment.