Skip to content

Commit

Permalink
Merge branch 'master' into gmain
Browse files Browse the repository at this point in the history
* master: (364 commits)
  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)
  [ci] Replace Firebase Test Lab deprecated Pixel 4 device with Pixel 5 (flutter#4436)
  [image_picker_for_web] Added support for maxWidth, maxHeight and imageQuality  (flutter#4389)
  Bump compileSdkVersion to 31 (flutter#4432)
  [camera] Update [CameraOrientationTests testOrientationNotifications] unit test to work on Xcode 13 (flutter#4426)
  Update integration_test README  (flutter#3824)
  [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)
  ...

# Conflicts:
#	packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
  • Loading branch information
yasargil committed Oct 25, 2021
2 parents 4650436 + 4b6b6b2 commit d37dd69
Show file tree
Hide file tree
Showing 1,266 changed files with 60,174 additions and 15,210 deletions.
105 changes: 101 additions & 4 deletions .ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,110 @@
# for every commit.
#
# More information at:
# * https://github.com/flutter/cocoon/blob/master/scheduler/README.md
# * 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
builder: Windows Plugins
postsubmit: false
- 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
23 changes: 13 additions & 10 deletions .ci/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
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
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 +14,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 +27,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 libgcrypt20-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
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 d37dd69

Please sign in to comment.