Skip to content

Commit 1c83c0a

Browse files
author
Felix Hofmann
committed
Merge commit '76e84c0679dbab7bfaaaa553b17bb0dbdb9a3c33' into update_video_src_on_same_controller
* commit '76e84c0679dbab7bfaaaa553b17bb0dbdb9a3c33': (537 commits) [video_player] Initialize player when size and duration become available (flutter#4438) [webview_flutter] Implement zoom enabled for ios and android (flutter#4417) Partial revert of "upgraded usage of BinaryMessenger (flutter#4451)" (flutter#4453) Implement Android WebView api with pigeon (Java portion) (flutter#4441) [in_app_purchase] Update to the latest pkg:json_serializable (flutter#4434) Implement Android WebView api with pigeon (Dart portion) (flutter#4435) upgraded usage of BinaryMessenger (flutter#4451) [flutter_plugin_tools] Fix pubspec-check on Windows (flutter#4428) Use OpenJDK 11 in CI jobs (flutter#4419) [google_sign_in] remove the commented out code in tests (flutter#4442) [webview] Fix typos in the README (flutter#4249) [google_sign_in] add serverAuthCode to GoogleSignInAccount (flutter#4180) [ci] Update macOS Cirrus image to Xcode 13 (flutter#4429) [shared_preferences] Switch to new analysis options (flutter#4384) [flutter_plugin_android_lifecycle] remove placeholder dart file (flutter#4413) [camera] Run iOS methods on UI thread by default (flutter#4140) [ci] Always run all `format` steps (flutter#4427) [flutter_plugin_tools] Fix license-check on Windows (flutter#4425) [google_maps_flutter] Clean Java test, consolidate Marker example. (flutter#4400) [image_picker][android] suppress unchecked warning (flutter#4408) ... # Conflicts: # packages/video_player/video_player/pubspec.yaml # packages/video_player/video_player_web/lib/video_player_web.dart # packages/video_player/video_player_web/pubspec.yaml
2 parents ca4bb1c + 76e84c0 commit 1c83c0a

File tree

1,825 files changed

+91966
-31689
lines changed

Some content is hidden

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

1,825 files changed

+91966
-31689
lines changed

‎.ci.yaml

+113
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
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 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+
dependencies: >
45+
[
46+
{"dependency": "vs_build"}
47+
]
48+
scheduler: luci
49+
50+
- name: Windows win32-platform_tests stable
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: 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+
dependencies: >
70+
[
71+
{"dependency": "vs_build"}
72+
]
73+
scheduler: luci
74+
75+
- name: Windows windows-build_all_plugins stable
76+
recipe: plugins/plugins
77+
timeout: 30
78+
properties:
79+
add_recipes_cq: "true"
80+
target_file: build_all_plugins.yaml
81+
channel: stable
82+
dependencies: >
83+
[
84+
{"dependency": "vs_build"}
85+
]
86+
scheduler: luci
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+
dependencies: >
95+
[
96+
{"dependency": "vs_build"}
97+
]
98+
scheduler: luci
99+
100+
- name: Windows plugin_tools_tests
101+
recipe: plugins/plugins
102+
timeout: 30
103+
properties:
104+
add_recipes_cq: "true"
105+
target_file: plugin_tools_tests.yaml
106+
scheduler: luci
107+
108+
- name: Linux ci_yaml plugins roller
109+
recipe: infra/ci_yaml
110+
timeout: 30
111+
scheduler: luci
112+
runIf:
113+
- .ci.yaml

‎.ci/Dockerfile

+13-10
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
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+
RUN apt-get install -y --no-install-recommends gnupg
69

710
# Add repo for gcloud sdk and install it
811
RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | \
@@ -11,7 +14,7 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.
1114
RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | \
1215
sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add -
1316

14-
RUN sudo apt-get update && sudo apt-get install -y google-cloud-sdk && \
17+
RUN apt-get update && apt-get install -y google-cloud-sdk && \
1518
gcloud config set core/disable_usage_reporting true && \
1619
gcloud config set component_manager/disable_update_check true
1720

@@ -24,20 +27,20 @@ RUN yes | sdkmanager \
2427
RUN yes | sdkmanager --licenses
2528

2629
# Install formatter.
27-
RUN sudo apt-get install -y clang-format
30+
RUN apt-get install -y clang-format
2831

2932
# Install xvfb to allow running headless
30-
RUN sudo apt-get install -y xvfb libegl1-mesa
33+
RUN apt-get install -y xvfb libegl1-mesa
3134
# Install Linux desktop build tool requirements.
32-
RUN sudo apt-get install -y clang cmake ninja-build file pkg-config
35+
RUN apt-get install -y clang cmake ninja-build file pkg-config
3336
# Install necessary libraries.
34-
RUN sudo apt-get install -y libgtk-3-dev libblkid-dev liblzma-dev libgcrypt20-dev
37+
RUN apt-get install -y libgtk-3-dev libblkid-dev liblzma-dev libgcrypt20-dev
3538

3639
# Add repo for Google Chrome and install it
3740
RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
3841
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
42+
RUN apt-get update && apt-get install -y --no-install-recommends google-chrome-stable
4043

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

‎.ci/dev/README.md

-19
This file was deleted.

‎.ci/dev/try_builders.json

-9
This file was deleted.

‎.ci/scripts/build_all_plugins.sh

+8
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

+7
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

‎.ci/scripts/build_examples_win32.sh

+7
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/create_all_plugins_app.sh

+7
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

+7
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/native_test_win32.sh

+7
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

‎.ci/scripts/plugin_tools_tests.sh

+7
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+
cd script/tool
7+
dart pub run test

‎.ci/scripts/prepare_tool.sh

+10
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/build_all_plugins.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
tasks:
2+
- name: prepare tool
3+
script: .ci/scripts/prepare_tool.sh
4+
- name: create all_plugins app
5+
script: .ci/scripts/create_all_plugins_app.sh
6+
- name: build all_plugins
7+
script: .ci/scripts/build_all_plugins.sh

‎.ci/targets/plugin_tools_tests.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
tasks:
2+
- name: prepare tool
3+
script: .ci/scripts/prepare_tool.sh
4+
- name: tool unit tests
5+
script: .ci/scripts/plugin_tools_tests.sh

‎.ci/targets/uwp_build_and_platform_tests.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
tasks:
2+
- name: prepare tool
3+
script: .ci/scripts/prepare_tool.sh
4+
- name: build examples (UWP)
5+
script: .ci/scripts/build_examples_uwp.sh

‎.ci/targets/windows_build_and_platform_tests.yaml

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
tasks:
2+
- name: prepare tool
3+
script: .ci/scripts/prepare_tool.sh
4+
- name: build examples (Win32)
5+
script: .ci/scripts/build_examples_win32.sh
6+
- name: native unit tests (Win32)
7+
script: .ci/scripts/native_test_win32.sh
8+
- name: drive examples (Win32)
9+
script: .ci/scripts/drive_examples_win32.sh

0 commit comments

Comments
 (0)