Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

Streamline CI setup, and reenable macOS credits #3697

Merged
merged 8 commits into from
Mar 10, 2021
Merged

Streamline CI setup, and reenable macOS credits #3697

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4b9d17b
Don't always get both channels; only make simulators when necessary
stuartmorgan-g Mar 10, 2021
973ef88
Re-enable credits for macOS
stuartmorgan-g Mar 10, 2021
272f852
Remove obsolete script step related to dummy iOS folders
stuartmorgan-g Mar 10, 2021
a06debc
Remove unnecessary git steps; some Flutter version is already cached
stuartmorgan-g Mar 10, 2021
35513e2
Adjust Linux tasks to improve concurrency
stuartmorgan-g Mar 10, 2021
07a13ed
Try re-consolidated upgrade script
stuartmorgan-g Mar 10, 2021
2f3f081
Use a shared template for setup
stuartmorgan-g Mar 10, 2021
bfeb38b
More minor cleanup
stuartmorgan-g Mar 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
123 changes: 42 additions & 81 deletions .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
# Light-workload tasks.
# These use default machines, with fewer CPUs, to reduce pressure on the
# concurrency limits.
task:
# don't run on release tags since it creates O(n^2) tasks where n is the number of plugins
root_task_template: &ROOT_TASK_TEMPLATE
# Don't run on release tags since it creates O(n^2) tasks where n is the
# number of plugins
only_if: $CIRRUS_TAG == ''
use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_PR == ''
container:
dockerfile: .ci/Dockerfile
env:
INTEGRATION_TEST_PATH: "./packages/integration_test"
upgrade_script:
- flutter channel stable
- flutter upgrade
- flutter channel master
CHANNEL: "master" # Default to master when not explicitly set by a task.
setup_script:
- flutter channel $CHANNEL
- flutter upgrade
- flutter config --enable-linux-desktop
- git fetch origin master
- git fetch origin master # To set FETCH_HEAD for "git merge-base" to work


# Light-workload Linux tasks.
# These use default machines, with fewer CPUs, to reduce pressure on the
# concurrency limits.
task:
<< : *ROOT_TASK_TEMPLATE
container:
dockerfile: .ci/Dockerfile
matrix:
### Platform-agnostic tasks ###
- name: plugin_tools_tests
Expand All @@ -25,7 +28,6 @@ task:
- CIRRUS_BUILD_ID=null pub run test
- name: publishable
script:
- flutter channel master
- ./script/check_publish.sh
- name: format
format_script: ./script/incremental_build.sh format --fail-on-change
Expand All @@ -35,14 +37,12 @@ task:
CHANNEL: "master"
CHANNEL: "stable"
test_script:
- flutter channel $CHANNEL
- ./script/incremental_build.sh test
- name: analyze_master
env:
matrix:
CHANNEL: "master"
script:
- flutter channel $CHANNEL
- ./script/incremental_build.sh analyze
## TODO(cyanglaz):
## Combing stable and master analyze jobs when integration test null safety is ready on flutter stable.
Expand All @@ -51,7 +51,6 @@ task:
matrix:
CHANNEL: "stable"
script:
- flutter channel $CHANNEL
- find . -depth -type d -wholename '*_web/example' -exec rm -rf {} \;
- ./script/incremental_build.sh analyze
### Android tasks ###
Expand All @@ -61,7 +60,6 @@ task:
CHANNEL: "master"
CHANNEL: "stable"
script:
- flutter channel $CHANNEL
- ./script/build_all_plugins_app.sh apk
### Web tasks ###
- name: build_all_plugins_web
Expand All @@ -70,14 +68,12 @@ task:
CHANNEL: "master"
CHANNEL: "stable"
script:
- flutter channel $CHANNEL
- ./script/build_all_plugins_app.sh web
- name: build-web-examples
env:
matrix:
CHANNEL: "master"
build_script:
- flutter channel $CHANNEL
- ./script/incremental_build.sh build-examples --web
# TODO: Add driving examples (and move to heavy-workload group).
### Linux desktop tasks ###
Expand All @@ -87,8 +83,17 @@ task:
CHANNEL: "master"
CHANNEL: "stable"
script:
- flutter channel $CHANNEL
- flutter config --enable-linux-desktop
- ./script/build_all_plugins_app.sh linux
- name: build-linux+drive-examples
env:
matrix:
CHANNEL: "master"
CHANNEL: "stable"
build_script:
- flutter config --enable-linux-desktop
- ./script/incremental_build.sh build-examples --linux
- xvfb-run ./script/incremental_build.sh drive-examples --linux

# Legacy Dockerfile configuration for web integration tests.
# https://github.com/flutter/web_installers doesn't yet support the current
Expand All @@ -97,20 +102,9 @@ task:
# tasks" block above once web_installers has been updated to support Chrome 89
# (which is what the current image generated from .ci/Dockerfile has).
task:
# don't run on release tags since it creates O(n^2) tasks where n is the number of plugins
only_if: $CIRRUS_TAG == ''
use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_PR == ''
<< : *ROOT_TASK_TEMPLATE
container:
dockerfile: .ci/Dockerfile-LegacyChrome
env:
INTEGRATION_TEST_PATH: "./packages/integration_test"
upgrade_script:
- flutter channel stable
- flutter upgrade
- flutter channel master
- flutter upgrade
- flutter config --enable-linux-desktop
- git fetch origin master
matrix:
- name: integration_web_smoke_test
env:
Expand All @@ -120,7 +114,6 @@ task:
# Tests integration example test in web.
only_if: "changesInclude('.cirrus.yml', 'packages/integration_test/**') || $CIRRUS_PR == ''"
install_script:
- flutter channel $CHANNEL
- git clone https://github.com/flutter/web_installers.git
- cd web_installers/packages/web_drivers/
- pub get
Expand All @@ -130,26 +123,15 @@ task:
- cd $INTEGRATION_TEST_PATH/example/
- flutter drive -v --driver=test_driver/integration_test.dart --target=integration_test/example_test.dart -d web-server --release --browser-name=chrome

# Heavy-workload tasks.
# Heavy-workload Linux tasks.
# These use machines with more CPUs and memory, so will reduce parallelization
# for non-credit runs.
task:
# don't run on release tags since it creates O(n^2) tasks where n is the number of plugins
only_if: $CIRRUS_TAG == ''
use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_PR == ''
<< : *ROOT_TASK_TEMPLATE
container:
dockerfile: .ci/Dockerfile
cpu: 8
memory: 16G
env:
INTEGRATION_TEST_PATH: "./packages/integration_test"
upgrade_script:
- flutter channel stable
- flutter upgrade
- flutter channel master
- flutter upgrade
- flutter config --enable-linux-desktop
- git fetch origin master
cpu: 4
memory: 12G
Comment on lines +133 to +134
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might have to play with this if you start seeing OOM failures.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, I figured this was safe since I wasn't seeing it going above 10 in general, but we can certainly adjust it back up if necessary.

matrix:
### Android tasks ###
- name: build-apks+java-test+firebase-test-lab
Expand All @@ -165,7 +147,6 @@ task:
MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[07586610af1fdfc894e5969f70ef2458341b9b7e9c3b7c4225a663b4a48732b7208a4d91c3b7d45305a6b55fa2a37fc4]
script:
- flutter channel $CHANNEL
# Unsetting CIRRUS_CHANGE_MESSAGE and CIRRUS_COMMIT_MESSAGE as they
# might include non-ASCII characters which makes Gradle crash.
# See: https://github.com/flutter/flutter/issues/24935
Expand All @@ -186,35 +167,16 @@ task:
- fi
- export CIRRUS_CHANGE_MESSAGE=`cat /tmp/cirrus_change_message.txt`
- export CIRRUS_COMMIT_MESSAGE=`cat /tmp/cirrus_commit_message.txt`
### Linux desktop tasks ###
- name: build-linux+drive-examples
env:
matrix:
CHANNEL: "master"
CHANNEL: "stable"
build_script:
- flutter channel $CHANNEL
- ./script/incremental_build.sh build-examples --linux
- xvfb-run ./script/incremental_build.sh drive-examples --linux

# macOS tasks.
task:
# Xcode 12 task
# don't run on release tags since it creates O(n^2) tasks where n is the number of plugins
only_if: $CIRRUS_TAG == ''
use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_PR == ''
<< : *ROOT_TASK_TEMPLATE
# Only one macOS task can run in parallel without credits, so use them for
# PRs on macOS.
use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
osx_instance:
image: big-sur-xcode-12.3
upgrade_script:
- sudo gem install cocoapods
- flutter channel stable
- flutter upgrade
- flutter channel master
- flutter upgrade
- flutter config --enable-macos-desktop
- git fetch origin master
create_simulator_script:
- xcrun simctl list
- xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-11 com.apple.CoreSimulator.SimRuntime.iOS-14-3 | xargs xcrun simctl boot
cocoapod_install_script: sudo gem install cocoapods
matrix:
### Platform-agnostic tasks ###
- name: lint_darwin_plugins
Expand All @@ -225,8 +187,6 @@ task:
script:
# TODO(jmagman): Lint macOS podspecs but skip any that fail library validation.
- find . -name "*.podspec" | xargs grep -l "osx" | xargs rm
# Skip the dummy podspecs used to placate the tool.
- find . -name "*_web*.podspec" -o -name "*_mac*.podspec" | xargs rm
- ./script/incremental_build.sh podspecs
### iOS tasks ###
- name: build_all_plugins_ipa
Expand All @@ -235,7 +195,6 @@ task:
CHANNEL: "master"
CHANNEL: "stable"
script:
- flutter channel $CHANNEL
- ./script/build_all_plugins_app.sh ios --no-codesign
- name: build-ipas+drive-examples
env:
Expand All @@ -250,8 +209,10 @@ task:
CHANNEL: "master"
CHANNEL: "stable"
SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
create_simulator_script:
- xcrun simctl list
- xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-11 com.apple.CoreSimulator.SimRuntime.iOS-14-3 | xargs xcrun simctl boot
build_script:
- flutter channel $CHANNEL
- ./script/incremental_build.sh build-examples --ipa
- ./script/incremental_build.sh xctest --skip $PLUGINS_TO_SKIP_XCTESTS --ios-destination "platform=iOS Simulator,name=iPhone 11,OS=latest"
# `drive-examples` contains integration tests, which changes the UI of the application.
Expand All @@ -265,7 +226,7 @@ task:
CHANNEL: "master"
CHANNEL: "stable"
script:
- flutter channel $CHANNEL
- flutter config --enable-macos-desktop
- ./script/build_all_plugins_app.sh macos
- name: build-macos+drive-examples
env:
Expand All @@ -274,6 +235,6 @@ task:
CHANNEL: "stable"
PATH: $PATH:/usr/local/bin
build_script:
- flutter channel $CHANNEL
- flutter config --enable-macos-desktop
- ./script/incremental_build.sh build-examples --macos --no-ipa
- ./script/incremental_build.sh drive-examples --macos