Skip to content

Commit

Permalink
Merge branch 'master' into quick_actions_mindapps
Browse files Browse the repository at this point in the history
* master: (1126 commits)
  [webview_flutter] Adjust test URLs again (flutter#4407)
  [google_sign_in] Add serverAuthCode attribute to google_sign_in_platform_interface user data (flutter#4179)
  [camera] Add filter for unsupported cameras on Android (flutter#4418)
  [webview_flutter] Update webview platform interface with new methods for running JavaScript. (flutter#4401)
  [webview_flutter] Add zoomEnabled to webview flutter platform interface (flutter#4404)
  [ci] Remove obsolete Dockerfile (flutter#4405)
  Fix order-dependant platform interface tests (flutter#4406)
  [google_maps_flutter]: LatLng longitude loses precision in constructor #90574 (flutter#4374)
  [google_maps_flutter] Add Marker drag events (flutter#2838)
  [flutter_plugin_tools] Validate pubspec description (flutter#4396)
  Add file_selector to the repo list (flutter#4395)
  [in_app_purchase] Fix in_app_purchase_android/README.md (flutter#4363)
  [google_maps_flutter_web] Add Marker drag events (flutter#4385)
  [webview_flutter] Fixed todos in FlutterWebView.java (flutter#4394)
  Handle `PurchaseStatus.restored` correctly in example. (flutter#4393)
  Handle restored purchases in iOS example app (flutter#4392)
  [file_selector] Remove custom analysis options (flutter#4382)
  [flutter_plugin_tools] Check licenses in Kotlin (flutter#4373)
  Fixed _CastError when running example App (flutter#4390)
  [in_app_purchase] Ensure the introductoryPriceMicros field is transported as a String. (flutter#4370)
  ...

# Conflicts:
#	packages/quick_actions/ios/Classes/FLTQuickActionsPlugin.m
  • Loading branch information
Marina González committed Oct 12, 2021
2 parents d8d413a + c254963 commit 419b195
Show file tree
Hide file tree
Showing 3,553 changed files with 158,657 additions and 54,615 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
113 changes: 113 additions & 0 deletions .ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
# 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 win32-platform_tests master
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 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"}
]
scheduler: luci

- name: Windows windows-build_all_plugins master
recipe: plugins/plugins
timeout: 30
properties:
add_recipes_cq: "true"
target_file: build_all_plugins.yaml
dependencies: >
[
{"dependency": "vs_build"}
]
scheduler: luci

- 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"}
]
scheduler: luci

- name: Windows uwp-platform_tests master
recipe: plugins/plugins
timeout: 30
properties:
add_recipes_cq: "true"
target_file: uwp_build_and_platform_tests.yaml
dependencies: >
[
{"dependency": "vs_build"}
]
scheduler: luci

- name: Windows plugin_tools_tests
recipe: plugins/plugins
timeout: 30
properties:
add_recipes_cq: "true"
target_file: plugin_tools_tests.yaml
scheduler: luci

- name: Linux ci_yaml plugins roller
recipe: infra/ci_yaml
timeout: 30
scheduler: luci
runIf:
- .ci.yaml
33 changes: 27 additions & 6 deletions .ci/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,24 @@
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" | \
sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list

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 @@ -23,7 +30,21 @@ RUN yes | sdkmanager \

RUN yes | sdkmanager --licenses

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

# Install xvfb to allow running headless
RUN apt-get install -y xvfb libegl1-mesa
# Install Linux desktop build tool requirements.
RUN apt-get install -y clang cmake ninja-build file pkg-config
# Install necessary libraries.
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 apt-get install -y xdg-utils
RUN xdg-settings set default-web-browser google-chrome.desktop
21 changes: 0 additions & 21 deletions .ci/Dockerfile-LinuxDesktop

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
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/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 \
--packages-for-branch
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
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 419b195

Please sign in to comment.