Skip to content

Commit

Permalink
Merge branch 'master' into add_zoom_to_android_webview
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
NickalasB committed Sep 7, 2021
2 parents fc41c1e + ae92e62 commit a5f2be6
Show file tree
Hide file tree
Showing 2,556 changed files with 80,562 additions and 36,279 deletions.
68 changes: 68 additions & 0 deletions .ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
# Describes the targets run in continuous integration environment.
#
# Flutter infra uses this file to generate a checklist of tasks to be performed
# for every commit.
#
# More information at:
# * https://github.com/flutter/cocoon/blob/master/CI_YAML.md
enabled_branches:
- master

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 master channel
recipe: plugins/plugins
timeout: 30
properties:
add_recipes_cq: "true"
target_file: windows_build_and_platform_tests.yaml
dependencies: >
[
{"dependency": "vs_build"}
]
scheduler: luci

- name: Windows Plugins stable channel
recipe: plugins/plugins
timeout: 30
properties:
add_recipes_cq: "true"
target_file: windows_build_and_platform_tests.yaml
channel: stable
dependencies: >
[
{"dependency": "vs_build"}
]
scheduler: luci

- name: Linux ci_yaml plugins roller
recipe: infra/ci_yaml
timeout: 30
scheduler: luci
runIf:
- .ci.yaml
27 changes: 17 additions & 10 deletions .ci/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
FROM cirrusci/flutter:stable
# 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

RUN sudo apt-get update -y
RUN apt-get update -y

RUN sudo apt-get install -y --no-install-recommends gnupg
# 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
RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | \
Expand All @@ -11,7 +18,7 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.
RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | \
sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add -

RUN sudo apt-get update && sudo apt-get install -y google-cloud-sdk && \
RUN apt-get update && apt-get install -y google-cloud-sdk && \
gcloud config set core/disable_usage_reporting true && \
gcloud config set component_manager/disable_update_check true

Expand All @@ -24,20 +31,20 @@ RUN yes | sdkmanager \
RUN yes | sdkmanager --licenses

# Install formatter.
RUN sudo apt-get install -y clang-format
RUN apt-get install -y clang-format

# Install xvfb to allow running headless
RUN sudo apt-get install -y xvfb libegl1-mesa
RUN apt-get install -y xvfb libegl1-mesa
# Install Linux desktop build tool requirements.
RUN sudo apt-get install -y clang cmake ninja-build file pkg-config
RUN apt-get install -y clang cmake ninja-build file pkg-config
# Install necessary libraries.
RUN sudo apt-get install -y libgtk-3-dev libblkid-dev liblzma-dev
RUN apt-get install -y libgtk-3-dev libblkid-dev liblzma-dev libgcrypt20-dev

# Add repo for Google Chrome and install it
RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
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 sudo apt-get update && sudo apt-get install -y --no-install-recommends google-chrome-stable
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.
RUN sudo apt-get install -y xdg-utils
RUN apt-get install -y xdg-utils
RUN xdg-settings set default-web-browser google-chrome.desktop
29 changes: 0 additions & 29 deletions .ci/Dockerfile-LegacyChrome

This file was deleted.

19 changes: 0 additions & 19 deletions .ci/dev/README.md

This file was deleted.

9 changes: 0 additions & 9 deletions .ci/dev/try_builders.json

This file was deleted.

33 changes: 33 additions & 0 deletions .ci/java8.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
FROM cirrusci/flutter:stable

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
RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | \
tee -a /etc/apt/sources.list.d/google-cloud-sdk.list

RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | \
apt-key --keyring /usr/share/keyrings/cloud.google.gpg add -

RUN apt-get update && apt-get install -y google-cloud-sdk && \
gcloud config set core/disable_usage_reporting true && \
gcloud config set component_manager/disable_update_check true

RUN yes | sdkmanager \
"platforms;android-27" \
"build-tools;27.0.3" \
"extras;google;m2repository" \
"extras;android;m2repository"

RUN yes | sdkmanager --licenses

# Install formatter.
RUN apt-get install -y clang-format
# Required by Roboeletric and the Android SDK.
RUN apt-get install -y openjdk-8-jdk
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
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 \
--packages-for-branch
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
8 changes: 8 additions & 0 deletions .ci/targets/windows_build_and_platform_tests.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@

tasks:
- name: "prepare tool"
script: .ci/scripts/prepare_tool.sh
- name: "build examples"
script: .ci/scripts/build_examples_win32.sh
- name: "drive examples"
script: .ci/scripts/drive_examples_win32.sh

0 comments on commit a5f2be6

Please sign in to comment.