[flutter_releases] Flutter stable 3.3.9 Framework Cherrypicks (#115856)
* Update Engine revision to 8f2221fbef28b478debb78dd233f5250b220ca99 for stable release 3.3.9
* [cirrus] Disable outside of tip of tree (#115774)
* [cirrus] Disable outside of tip of tree
* Fix string issue
* Remove old field
* Cirrus_branch to branch
* Branch to cirrus branch
* Cirrus branch -> cirrus base branch
Co-authored-by: Casey Hillers <chillers@google.com>
diff --git a/.cirrus.yml b/.cirrus.yml
index 8477c86..72bdcdd 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -68,7 +68,7 @@
- which flutter
matrix:
- name: analyze-linux # linux-only
- only_if: "$CIRRUS_PR != ''"
+ only_if: "$CIRRUS_PR != '' && $CIRRUS_BASE_BRANCH == 'master'"
environment:
# Empirically, the analyze-linux shard runs surprisingly fast (under 15 minutes) with just 1
# CPU. We noticed OOM failures with 6GB 4/2020, so we increased the memory.
@@ -78,7 +78,7 @@
- dart --enable-asserts ./dev/bots/analyze.dart
- name: framework_tests-widgets-linux
- only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter/**', 'packages/flutter_test/**', 'packages/flutter_tools/lib/src/test/**', 'bin/**') && $CIRRUS_PR != ''"
+ only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter/**', 'packages/flutter_test/**', 'packages/flutter_tools/lib/src/test/**', 'bin/**') && $CIRRUS_PR != '' && $CIRRUS_BASE_BRANCH == 'master'"
environment:
# We use 3 CPUs because that's the minimum required to get framework_tests-widgets-linux
# running fast enough that it is not the long pole, as of October 2019.
@@ -87,7 +87,7 @@
- dart --enable-asserts ./dev/bots/test.dart
- name: framework_tests-libraries-linux
- only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter/**', 'packages/flutter_test/**', 'packages/flutter_tools/lib/src/test/**', 'bin/**') && $CIRRUS_PR != ''"
+ only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter/**', 'packages/flutter_test/**', 'packages/flutter_tools/lib/src/test/**', 'bin/**') && $CIRRUS_PR != '' && $CIRRUS_BASE_BRANCH == 'master'"
environment:
# We use 3 CPUs because that's the minimum required to get the
# framework_tests-libraries-linux shard running fast enough that it is not the long pole, as
@@ -98,7 +98,7 @@
- name: framework_tests-misc-linux
# this includes the tests for directories in dev/
- only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter/**', 'packages/flutter_goldens/**', 'packages/flutter_test/**', 'packages/flutter_tools/lib/src/test/**', 'bin/**') && $CIRRUS_PR != ''"
+ only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter/**', 'packages/flutter_goldens/**', 'packages/flutter_test/**', 'packages/flutter_tools/lib/src/test/**', 'bin/**') && $CIRRUS_PR != '' && $CIRRUS_BASE_BRANCH == 'master'"
environment:
# We use 3 CPUs because that's the minimum required to get framework_tests-misc-linux
# running fast enough that it is not the long pole, as of October 2019.
@@ -107,7 +107,7 @@
- dart --enable-asserts ./dev/bots/test.dart
- name: tool_tests-general-linux
- only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter_tools/**', 'bin/**') && $CIRRUS_PR != ''"
+ only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter_tools/**', 'bin/**') && $CIRRUS_PR != '' && $CIRRUS_BASE_BRANCH == 'master'"
environment:
# As of November 2019, the tool_tests-general-linux shard got faster with more CPUs up to 4
# CPUs, and needed at least 10G of RAM to not run out of memory.
@@ -122,7 +122,7 @@
- dart --enable-asserts ./dev/bots/test.dart
- name: tool_tests-commands-linux
- only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter_tools/**', 'bin/**') && $CIRRUS_PR != ''"
+ only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter_tools/**', 'bin/**') && $CIRRUS_PR != '' && $CIRRUS_BASE_BRANCH == 'master'"
environment:
# As of October 2019, the tool_tests-commands-linux shard got faster with more CPUs up to 6
# CPUs, and needed at least 8G of RAM to not run out of memory.
@@ -139,12 +139,12 @@
environment:
CPU: 4
MEMORY: 12G
- only_if: "$CIRRUS_PR != ''"
+ only_if: "$CIRRUS_PR != '' && $CIRRUS_BASE_BRANCH == 'master'"
script:
- ./dev/bots/docs.sh
- name: customer_testing-linux
- only_if: "$CIRRUS_PR != ''"
+ only_if: "$CIRRUS_PR != '' && $CIRRUS_BASE_BRANCH == 'master'"
environment:
# Empirically, this shard runs fine at 1 CPU and 4G RAM as of October 2019. We will probably
# want to grow this container when we invite people to add their tests in large numbers.
diff --git a/bin/internal/engine.version b/bin/internal/engine.version
index b42ddef..812f8c2 100644
--- a/bin/internal/engine.version
+++ b/bin/internal/engine.version
@@ -1 +1 @@
-857bd6b74c5eb56151bfafe91e7fa6a82b6fee25
+8f2221fbef28b478debb78dd233f5250b220ca99
