Skip to content

Commit

Permalink
Merge branch 'main' into null_status_retriable
Browse files Browse the repository at this point in the history
* main: (479 commits)
  removes raw ArrayLists (flutter#3101)
  Roll Flutter from c9affdba9dcd to 27f8ebdaed70 (15 revisions) (flutter#3098)
  [ci] Fix the new LUCI iOS build-all tasks (flutter#3099)
  [pigeon] [ObjC] Removes unused GetNullableObject function (flutter#3100)
  [pigeon] Swift host error handling (flutter#3084)
  Roll Flutter from a815ee634202 to c9affdba9dcd (23 revisions) (flutter#3093)
  [ci] Enable min SDK version checks (flutter#3095)
  [pigeon] Fix C++ config handling (flutter#3094)
  [ci] Add LUCI version of iOS build-all (flutter#3096)
  [pigeon] Adds SwiftFunction annotation (flutter#2304)
  [flutter_adaptive_scaffold] Change `selectedIndex` on `standardNavigationRail` to allow null value. (flutter#3088)
  [pigeon] requires analyzer 5.2.0 (flutter#3090)
  Roll Flutter from c35efdaa6854 to a815ee634202 (22 revisions) (flutter#3089)
  [ci] Update legacy Flutter version tests (flutter#3087)
  Roll Flutter (stable) from 135454af3247 to b06b8b271095 (2551 revisions) (flutter#3086)
  [flutter_adaptive_scaffold] Fix leading and trailing Navigation Rail Widgets (flutter#3080)
  Roll Flutter from bd7bee0f9eb8 to c35efdaa6854 (24 revisions) (flutter#3085)
  [pigeon] Minor C++ output adjustments (flutter#3083)
  [pigeon] Updates writeScoped and addScoped to disallow symbol-less use. (flutter#3081)
  Roll Flutter from f33e8d3701b5 to bd7bee0f9eb8 (5 revisions) (flutter#3082)
  ...
  • Loading branch information
Jeremy committed Jan 30, 2023
2 parents 95d2baf + 90a890d commit 577bbb1
Show file tree
Hide file tree
Showing 1,369 changed files with 88,090 additions and 26,244 deletions.
128 changes: 118 additions & 10 deletions .ci.yaml
Expand Up @@ -11,18 +11,102 @@ enabled_branches:
platform_properties:
linux:
properties:
fuchsia_ctl_version: ""
os: Linux
windows:
properties:
dependencies: >
[
{"dependency": "certs"}
{"dependency": "certs", "version": "version:9563bb"}
]
device_type: none
os: Windows
mac_arm64:
properties:
dependencies: >-
[
{"dependency": "xcode", "version": "14a5294e"},
{"dependency": "gems", "version": "v3.3.14"}
]
os: Mac-12
device_type: none
cpu: arm64
xcode: 14a5294e # xcode 14.0 beta 5
mac_x64:
properties:
dependencies: >-
[
{"dependency": "xcode", "version": "14a5294e"},
{"dependency": "gems", "version": "v3.3.14"}
]
os: Mac-12
device_type: none
cpu: x86
xcode: 14a5294e # xcode 14.0 beta 5

targets:
### iOS tasks ###
- name: Mac_arm64 ios_build_all_packages master
bringup: true
recipe: packages/packages
timeout: 30
properties:
add_recipes_cq: "true"
version_file: flutter_master.version
target_file: ios_build_all_packages.yaml
channel: master

- name: Mac_arm64 ios_build_all_packages stable
bringup: true
recipe: packages/packages
timeout: 30
properties:
add_recipes_cq: "true"
version_file: flutter_stable.version
target_file: ios_build_all_packages.yaml
channel: stable

### macOS desktop tasks ###
# macos-platform_tests builds all the packages on ARM, so this build is run
# on Intel to give us build coverage of both host types.
- name: Mac_x64 build_all_packages master
recipe: packages/packages
timeout: 30
properties:
add_recipes_cq: "true"
version_file: flutter_master.version
target_file: mac_build_all_packages.yaml
channel: master

- name: Mac_x64 build_all_packages stable
recipe: packages/packages
timeout: 30
properties:
add_recipes_cq: "true"
version_file: flutter_stable.version
target_file: mac_build_all_packages.yaml
channel: stable

- name: Mac_arm64 custom_package_tests master
bringup: true # New configuration
recipe: packages/packages
timeout: 30
properties:
add_recipes_cq: "true"
version_file: flutter_master.version
target_file: mac_custom_package_tests.yaml
channel: master

- name: Mac_arm64 custom_package_tests stable
bringup: true # New configuration
recipe: packages/packages
timeout: 30
properties:
add_recipes_cq: "true"
version_file: flutter_stable.version
target_file: mac_custom_package_tests.yaml
channel: stable

### Windows desktop tasks ###
- name: Windows custom_package_tests master - packages
recipe: packages/packages
timeout: 30
Expand All @@ -33,7 +117,7 @@ targets:
version_file: flutter_master.version
dependencies: >
[
{"dependency": "vs_build"}
{"dependency": "vs_build", "version": "version:vs2019"}
]
- name: Windows dart_unit_tests master - packages
Expand All @@ -46,7 +130,8 @@ targets:
version_file: flutter_master.version
dependencies: >
[
{"dependency": "vs_build"}
{"dependency": "vs_build", "version": "version:vs2019"},
{"dependency": "open_jdk", "version": "version:11"}
]
- name: Windows win32-platform_tests master - packages
Expand All @@ -59,7 +144,7 @@ targets:
version_file: flutter_master.version
dependencies: >
[
{"dependency": "vs_build"}
{"dependency": "vs_build", "version": "version:vs2019"}
]
- name: Windows win32-platform_tests stable - packages
Expand All @@ -69,17 +154,40 @@ targets:
add_recipes_cq: "true"
target_file: windows_build_and_platform_tests.yaml
channel: stable
version_file: flutter_stable.version
dependencies: >
[
{"dependency": "vs_build", "version": "version:vs2019"}
]
- name: Windows windows-build_all_packages master
recipe: packages/packages
timeout: 30
properties:
add_recipes_cq: "true"
target_file: windows_build_all_packages.yaml
channel: master
version_file: flutter_master.version
dependencies: >
[
{"dependency": "vs_build"}
{"dependency": "vs_build", "version": "version:vs2019"}
]
- name: Linux fuchsia_ctl
postsubmit: false
recipe: fuchsia_ctl
timeout: 90
- name: Windows windows-build_all_packages stable
recipe: packages/packages
timeout: 30
properties:
add_recipes_cq: "true"
target_file: windows_build_all_packages.yaml
channel: stable
version_file: flutter_stable.version
dependencies: >
[
{"dependency": "vs_build", "version": "version:vs2019"}
]
- name: Linux ci_yaml packages roller
recipe: infra/ci_yaml
timeout: 30
runIf:
- .ci.yaml
51 changes: 32 additions & 19 deletions .ci/Dockerfile
@@ -1,30 +1,43 @@
# Last updated 02/04/2022 (to rebuild the docker image, update this timestamp)
# 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@sha256:283f328d162adfc345bec5e070f79201edcb28f5483addf238c57d78bad0da23
# This is the hash for the 3.0.0 image.
FROM cirrusci/flutter@sha256:794fbbce5422e79aae1dbf6e6cbfcf5fe89aff50350d7c018853b3cfdf35821a

RUN sudo apt-get update && \
sudo apt-get upgrade --yes && \
sudo apt-get install --yes gpg-agent && \
sudo apt-get clean --yes
RUN apt-get update -y

# This must occur after the install of gpg-agent
RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
# Set up Firebase Test Lab requirements.
RUN apt-get install -y --no-install-recommends gnupg
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
RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | \
sudo 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

# Install formatter for C-based languages.
RUN apt-get install -y clang-format

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

# Needed for web_benchmarks
RUN sudo apt-get install -y libgbm-dev

RUN yes | sdkmanager \
"platforms;android-27" \
"build-tools;27.0.3" \
"extras;google;m2repository" \
"extras;android;m2repository"
# Install Chrome and make it the default browser, for Linux url_launcher tests.
# IMPORTANT: Web tests should use a pinned version of Chromium, not this, since
# this isn't pinned, so any time the docker image is re-created the version of
# Chrome may change.
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 apt-get update && apt-get install -y --no-install-recommends google-chrome-stable
# Make Chrome the default for http:, https: and file:.
RUN apt-get install -y xdg-utils
RUN xdg-settings set default-web-browser google-chrome.desktop
RUN xdg-mime default google-chrome.desktop inode/directory

RUN yes | sdkmanager --licenses
# Needed for web_benchmarks.
RUN sudo apt-get install -y libgbm-dev
2 changes: 1 addition & 1 deletion .ci/flutter_master.version
@@ -1 +1 @@
36fe51524f7219b4cfe9869a63d691d20443d994
27f8ebdaed7078f311d456befae1c6236ba65fd8
1 change: 1 addition & 0 deletions .ci/flutter_stable.version
@@ -0,0 +1 @@
b06b8b2710955028a6b562f5aa6fe62941d6febf
10 changes: 10 additions & 0 deletions .ci/scripts/build_all_packages_app.sh
@@ -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.

platform="$1"
build_mode="$2"
shift 2
cd all_packages
flutter build "$platform" --"$build_mode" "$@"
7 changes: 7 additions & 0 deletions .ci/scripts/create_all_packages_app.sh
@@ -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 pub global run flutter_plugin_tools create-all-packages-app \
--output-dir=. --exclude script/configs/exclude_all_packages_app.yaml
4 changes: 2 additions & 2 deletions .ci/scripts/custom_package_tests.sh
Expand Up @@ -5,9 +5,9 @@

# Exclusions
#
# cross_file
# script/configs/linux_only_custom_test.yaml
# Custom tests need Chrome. (They run in linux-custom_package_tests)

dart pub global run flutter_plugin_tools custom-test \
--packages-for-branch --log-timing \
--exclude=cross_file
--exclude=script/configs/linux_only_custom_test.yaml
4 changes: 2 additions & 2 deletions .ci/scripts/prepare_tool.sh
Expand Up @@ -4,8 +4,8 @@
# found in the LICENSE file.

# To set FETCH_HEAD for "git merge-base" to work
git fetch origin master
git fetch origin main

# Pinned version of the plugin tools, to avoid breakage in this repository
# when pushing updates from flutter/plugins.
dart pub global activate flutter_plugin_tools 0.8.5
dart pub global activate flutter_plugin_tools 0.13.4
11 changes: 11 additions & 0 deletions .ci/targets/ios_build_all_packages.yaml
@@ -0,0 +1,11 @@
tasks:
- name: prepare tool
script: .ci/scripts/prepare_tool.sh
- name: create all_packages app
script: .ci/scripts/create_all_packages_app.sh
- name: build all_packages for iOS debug
script: .ci/scripts/build_all_packages_app.sh
args: ["ios", "debug", "--no-codesign"]
- name: build all_packages for iOS release
script: .ci/scripts/build_all_packages_app.sh
args: ["ios", "release", "--no-codesign"]
11 changes: 11 additions & 0 deletions .ci/targets/mac_build_all_packages.yaml
@@ -0,0 +1,11 @@
tasks:
- name: prepare tool
script: .ci/scripts/prepare_tool.sh
- name: create all_packages app
script: .ci/scripts/create_all_packages_app.sh
- name: build all_packages for macOS debug
script: .ci/scripts/build_all_packages_app.sh
args: ["macos", "debug"]
- name: build all_plugins for macOS release
script: .ci/scripts/build_all_packages_app.sh
args: ["macos", "release"]
5 changes: 5 additions & 0 deletions .ci/targets/mac_custom_package_tests.yaml
@@ -0,0 +1,5 @@
tasks:
- name: prepare tool
script: .ci/scripts/prepare_tool.sh
- name: custom package tests
script: .ci/scripts/custom_package_tests.sh
11 changes: 11 additions & 0 deletions .ci/targets/windows_build_all_packages.yaml
@@ -0,0 +1,11 @@
tasks:
- name: prepare tool
script: .ci/scripts/prepare_tool.sh
- name: create all_packages app
script: .ci/scripts/create_all_packages_app.sh
- name: build all_packages app for Windows debug
script: .ci/scripts/build_all_packages_app.sh
args: ["windows", "debug"]
- name: build all_packages app for Windows release
script: .ci/scripts/build_all_packages_app.sh
args: ["windows", "release"]

0 comments on commit 577bbb1

Please sign in to comment.