Skip to content

Commit b8f7f1f

Browse files
itsjustkevinCasey Hillers
and
Casey Hillers
authored
[flutter_releases] Flutter stable 3.3.9 Framework Cherrypicks (flutter#115856)
* Update Engine revision to 8f2221fbef28b478debb78dd233f5250b220ca99 for stable release 3.3.9 * [cirrus] Disable outside of tip of tree (flutter#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 <[email protected]>
1 parent 52b3dc2 commit b8f7f1f

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

.cirrus.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ task:
6868
- which flutter
6969
matrix:
7070
- name: analyze-linux # linux-only
71-
only_if: "$CIRRUS_PR != ''"
71+
only_if: "$CIRRUS_PR != '' && $CIRRUS_BASE_BRANCH == 'master'"
7272
environment:
7373
# Empirically, the analyze-linux shard runs surprisingly fast (under 15 minutes) with just 1
7474
# CPU. We noticed OOM failures with 6GB 4/2020, so we increased the memory.
@@ -78,7 +78,7 @@ task:
7878
- dart --enable-asserts ./dev/bots/analyze.dart
7979

8080
- name: framework_tests-widgets-linux
81-
only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter/**', 'packages/flutter_test/**', 'packages/flutter_tools/lib/src/test/**', 'bin/**') && $CIRRUS_PR != ''"
81+
only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter/**', 'packages/flutter_test/**', 'packages/flutter_tools/lib/src/test/**', 'bin/**') && $CIRRUS_PR != '' && $CIRRUS_BASE_BRANCH == 'master'"
8282
environment:
8383
# We use 3 CPUs because that's the minimum required to get framework_tests-widgets-linux
8484
# running fast enough that it is not the long pole, as of October 2019.
@@ -87,7 +87,7 @@ task:
8787
- dart --enable-asserts ./dev/bots/test.dart
8888

8989
- name: framework_tests-libraries-linux
90-
only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter/**', 'packages/flutter_test/**', 'packages/flutter_tools/lib/src/test/**', 'bin/**') && $CIRRUS_PR != ''"
90+
only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter/**', 'packages/flutter_test/**', 'packages/flutter_tools/lib/src/test/**', 'bin/**') && $CIRRUS_PR != '' && $CIRRUS_BASE_BRANCH == 'master'"
9191
environment:
9292
# We use 3 CPUs because that's the minimum required to get the
9393
# framework_tests-libraries-linux shard running fast enough that it is not the long pole, as
@@ -98,7 +98,7 @@ task:
9898

9999
- name: framework_tests-misc-linux
100100
# this includes the tests for directories in dev/
101-
only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter/**', 'packages/flutter_goldens/**', 'packages/flutter_test/**', 'packages/flutter_tools/lib/src/test/**', 'bin/**') && $CIRRUS_PR != ''"
101+
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'"
102102
environment:
103103
# We use 3 CPUs because that's the minimum required to get framework_tests-misc-linux
104104
# running fast enough that it is not the long pole, as of October 2019.
@@ -107,7 +107,7 @@ task:
107107
- dart --enable-asserts ./dev/bots/test.dart
108108

109109
- name: tool_tests-general-linux
110-
only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter_tools/**', 'bin/**') && $CIRRUS_PR != ''"
110+
only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter_tools/**', 'bin/**') && $CIRRUS_PR != '' && $CIRRUS_BASE_BRANCH == 'master'"
111111
environment:
112112
# As of November 2019, the tool_tests-general-linux shard got faster with more CPUs up to 4
113113
# CPUs, and needed at least 10G of RAM to not run out of memory.
@@ -122,7 +122,7 @@ task:
122122
- dart --enable-asserts ./dev/bots/test.dart
123123

124124
- name: tool_tests-commands-linux
125-
only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter_tools/**', 'bin/**') && $CIRRUS_PR != ''"
125+
only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter_tools/**', 'bin/**') && $CIRRUS_PR != '' && $CIRRUS_BASE_BRANCH == 'master'"
126126
environment:
127127
# As of October 2019, the tool_tests-commands-linux shard got faster with more CPUs up to 6
128128
# CPUs, and needed at least 8G of RAM to not run out of memory.
@@ -139,12 +139,12 @@ task:
139139
environment:
140140
CPU: 4
141141
MEMORY: 12G
142-
only_if: "$CIRRUS_PR != ''"
142+
only_if: "$CIRRUS_PR != '' && $CIRRUS_BASE_BRANCH == 'master'"
143143
script:
144144
- ./dev/bots/docs.sh
145145

146146
- name: customer_testing-linux
147-
only_if: "$CIRRUS_PR != ''"
147+
only_if: "$CIRRUS_PR != '' && $CIRRUS_BASE_BRANCH == 'master'"
148148
environment:
149149
# Empirically, this shard runs fine at 1 CPU and 4G RAM as of October 2019. We will probably
150150
# want to grow this container when we invite people to add their tests in large numbers.

bin/internal/engine.version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
857bd6b74c5eb56151bfafe91e7fa6a82b6fee25
1+
8f2221fbef28b478debb78dd233f5250b220ca99

0 commit comments

Comments
 (0)