Skip to content

Commit a5f2be6

Browse files
NickalasBNickalasB
committed
Merge branch 'master' into add_zoom_to_android_webview
* master: (490 commits) Allow neutral conclusion in publishing check (flutter#4321) Revert "[image_picker] add forceFullMetadata to interface" (flutter#4314) [image_picker] add forceFullMetadata to interface (flutter#4288) [flutter_plugin_tools] Adjust diff logging (flutter#4312) Remove gradle.properties from plugins (flutter#4309) build-examples .pluginToolsConfig.yaml support (flutter#4305) [camera_web] Make plugin publishable for the first time. (flutter#4304) adds option to re-authenticate on google silent sign in (flutter#4251) [ci.yaml] Add builders to recipes cq (flutter#4306) Add scripts for Windows LUCI recipe (flutter#4303) [video_player] Ensure seekTo is not called before video player is initialized. (flutter#4300) Ensure setExposureOffset returns new value on Android (flutter#4301) Add a way to opt a file out of Dart formatting (flutter#4292) [flutter_plugin_tools] Add Linux support to native-test (flutter#4294) [image_picker]Android update cache (flutter#4124) [flutter_plugin_tools] Fix build-examples for packages (flutter#4248) [flutter_plugin_tool] Migrate 'publish' to new base command (flutter#4290) [flutter_plugin_tool] Move branch-switching logic from tool_runner.sh to tool (flutter#4268) [flutter_plugin_tool] Add support for running Windows unit tests (flutter#4276) [camera_web] Do not flip the video on the back camera (flutter#4281) ... # Conflicts: # packages/webview_flutter/webview_flutter/CHANGELOG.md # packages/webview_flutter/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java # packages/webview_flutter/webview_flutter/pubspec.yaml
2 parents fc41c1e + ae92e62 commit a5f2be6

2,556 files changed

Lines changed: 80562 additions & 36279 deletions

File tree

Some content is hidden

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

‎.ci.yaml‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
# Describes the targets run in continuous integration environment.
2+
#
3+
# Flutter infra uses this file to generate a checklist of tasks to be performed
4+
# for every commit.
5+
#
6+
# More information at:
7+
# * https://github.com/flutter/cocoon/blob/master/CI_YAML.md
8+
enabled_branches:
9+
- master
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
36+
37+
targets:
38+
- name: Windows Plugins master channel
39+
recipe: plugins/plugins
40+
timeout: 30
41+
properties:
42+
add_recipes_cq: "true"
43+
target_file: windows_build_and_platform_tests.yaml
44+
dependencies: >
45+
[
46+
{"dependency": "vs_build"}
47+
]
48+
scheduler: luci
49+
50+
- name: Windows Plugins stable channel
51+
recipe: plugins/plugins
52+
timeout: 30
53+
properties:
54+
add_recipes_cq: "true"
55+
target_file: windows_build_and_platform_tests.yaml
56+
channel: stable
57+
dependencies: >
58+
[
59+
{"dependency": "vs_build"}
60+
]
61+
scheduler: luci
62+
63+
- name: Linux ci_yaml plugins roller
64+
recipe: infra/ci_yaml
65+
timeout: 30
66+
scheduler: luci
67+
runIf:
68+
- .ci.yaml

‎.ci/Dockerfile‎

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

3-
RUN sudo apt-get update -y
6+
RUN apt-get update -y
47

5-
RUN sudo apt-get install -y --no-install-recommends gnupg
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+
12+
RUN apt-get install -y --no-install-recommends gnupg
613

714
# Add repo for gcloud sdk and install it
815
RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | \
@@ -11,7 +18,7 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.
1118
RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | \
1219
sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add -
1320

14-
RUN sudo apt-get update && sudo apt-get install -y google-cloud-sdk && \
21+
RUN apt-get update && apt-get install -y google-cloud-sdk && \
1522
gcloud config set core/disable_usage_reporting true && \
1623
gcloud config set component_manager/disable_update_check true
1724

@@ -24,20 +31,20 @@ RUN yes | sdkmanager \
2431
RUN yes | sdkmanager --licenses
2532

2633
# Install formatter.
27-
RUN sudo apt-get install -y clang-format
34+
RUN apt-get install -y clang-format
2835

2936
# Install xvfb to allow running headless
30-
RUN sudo apt-get install -y xvfb libegl1-mesa
37+
RUN apt-get install -y xvfb libegl1-mesa
3138
# Install Linux desktop build tool requirements.
32-
RUN sudo apt-get install -y clang cmake ninja-build file pkg-config
39+
RUN apt-get install -y clang cmake ninja-build file pkg-config
3340
# Install necessary libraries.
34-
RUN sudo apt-get install -y libgtk-3-dev libblkid-dev liblzma-dev
41+
RUN apt-get install -y libgtk-3-dev libblkid-dev liblzma-dev libgcrypt20-dev
3542

3643
# Add repo for Google Chrome and install it
3744
RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
3845
RUN echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main' | sudo tee /etc/apt/sources.list.d/google-chrome.list
39-
RUN sudo apt-get update && sudo apt-get install -y --no-install-recommends google-chrome-stable
46+
RUN apt-get update && apt-get install -y --no-install-recommends google-chrome-stable
4047

4148
# Make Chrome the default so http: has a handler for url_launcher tests.
42-
RUN sudo apt-get install -y xdg-utils
49+
RUN apt-get install -y xdg-utils
4350
RUN xdg-settings set default-web-browser google-chrome.desktop

‎.ci/Dockerfile-LegacyChrome‎

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

‎.ci/dev/README.md‎

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

‎.ci/dev/try_builders.json‎

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

‎.ci/java8.Dockerfile‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
FROM cirrusci/flutter:stable
2+
3+
RUN apt-get update -y
4+
5+
# Required by Roboeletric and the Android SDK.
6+
RUN apt-get install -y openjdk-8-jdk
7+
ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
8+
9+
RUN apt-get install -y --no-install-recommends gnupg
10+
11+
# Add repo for gcloud sdk and install it
12+
RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | \
13+
tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
14+
15+
RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | \
16+
apt-key --keyring /usr/share/keyrings/cloud.google.gpg add -
17+
18+
RUN apt-get update && apt-get install -y google-cloud-sdk && \
19+
gcloud config set core/disable_usage_reporting true && \
20+
gcloud config set component_manager/disable_update_check true
21+
22+
RUN yes | sdkmanager \
23+
"platforms;android-27" \
24+
"build-tools;27.0.3" \
25+
"extras;google;m2repository" \
26+
"extras;android;m2repository"
27+
28+
RUN yes | sdkmanager --licenses
29+
30+
# Install formatter.
31+
RUN apt-get install -y clang-format
32+
# Required by Roboeletric and the Android SDK.
33+
RUN apt-get install -y openjdk-8-jdk

‎.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

‎.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+
--packages-for-branch

‎.ci/scripts/prepare_tool.sh‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
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+
# To set FETCH_HEAD for "git merge-base" to work
7+
git fetch origin master
8+
9+
cd script/tool
10+
dart pub get

‎.ci/targets/windows_build_and_platform_tests.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
2+
tasks:
3+
- name: "prepare tool"
4+
script: .ci/scripts/prepare_tool.sh
5+
- name: "build examples"
6+
script: .ci/scripts/build_examples_win32.sh
7+
- name: "drive examples"
8+
script: .ci/scripts/drive_examples_win32.sh

0 commit comments

Comments
 (0)