[go: nahoru, domu]
Skip to content

Commit

Permalink
[flutter_releases] Flutter stable 3.3.9 Framework Cherrypicks (flutte…
Browse files Browse the repository at this point in the history 
…r#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 <chillers@google.com>
  • Loading branch information
@itsjustkevin
itsjustkevin and Casey Hillers committed Nov 22, 2022
1 parent 52b3dc2 commit b8f7f1f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions .cirrus.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ task:
- 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.
Expand All @@ -78,7 +78,7 @@ task:
- 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.
Expand All @@ -87,7 +87,7 @@ task:
- 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
Expand All @@ -98,7 +98,7 @@ task:

- 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.
Expand All @@ -107,7 +107,7 @@ task:
- 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.
Expand All @@ -122,7 +122,7 @@ task:
- 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.
Expand All @@ -139,12 +139,12 @@ task:
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.
Expand Down
2 changes: 1 addition & 1 deletion bin/internal/engine.version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
857bd6b74c5eb56151bfafe91e7fa6a82b6fee25
8f2221fbef28b478debb78dd233f5250b220ca99

0 comments on commit b8f7f1f

Please sign in to comment.