Enable mac sdk tests and remove them from cirrus. (#65896)
diff --git a/.cirrus.yml b/.cirrus.yml
index 73ed9ae..8ad8e96 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -382,80 +382,8 @@
- date
- which flutter
matrix:
- - name: framework_tests-widgets-macos
- only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter/**', 'packages/flutter_test/**', 'packages/flutter_tools/lib/src/test/**', 'bin/**') || $CIRRUS_PR == ''"
- environment:
- GOLDCTL: "$CIRRUS_WORKING_DIR/depot_tools/goldctl"
- GOLD_SERVICE_ACCOUNT: ENCRYPTED[3afeea5ac7201151c3d0dc9648862f0462b5e4f55dc600ca8b692319622f7c3eda3d577b1b16cc2ef0311b7314c1c095]
- script:
- - ulimit -S -n 2048 # https://github.com/flutter/flutter/issues/2976
- - ./dev/bots/download_goldctl.sh
- - dart --enable-asserts dev/bots/test.dart
-
- - name: framework_tests-libraries-macos
- only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter/**', 'packages/flutter_test/**', 'packages/flutter_tools/lib/src/test/**', 'bin/**') || $CIRRUS_PR == ''"
- environment:
- GOLDCTL: "$CIRRUS_WORKING_DIR/depot_tools/goldctl"
- GOLD_SERVICE_ACCOUNT: ENCRYPTED[3afeea5ac7201151c3d0dc9648862f0462b5e4f55dc600ca8b692319622f7c3eda3d577b1b16cc2ef0311b7314c1c095]
- script:
- - ulimit -S -n 2048 # https://github.com/flutter/flutter/issues/2976
- - ./dev/bots/download_goldctl.sh
- - dart --enable-asserts dev/bots/test.dart
-
- - name: framework_tests-misc-macos
- # this includes the tests for directories in dev/
- only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter/**', 'packages/flutter_goldens/**', 'packages/flutter_goldens_client/**', 'packages/flutter_test/**', 'packages/flutter_tools/lib/src/test/**', 'bin/**') || $CIRRUS_PR == ''"
- script:
- - ulimit -S -n 2048 # https://github.com/flutter/flutter/issues/2976
- - dart --enable-asserts dev/bots/test.dart
-
- - name: tool_tests-general-macos
- only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter_tools/**', 'bin/**') || $CIRRUS_PR == ''"
- environment:
- SHOULD_UPDATE_PACKAGES: 'FALSE'
- script:
- - ulimit -S -n 2048 # https://github.com/flutter/flutter/issues/2976
- - (cd packages/flutter_tools; pub get)
- - (cd packages/flutter_tools/test/data/asset_test/main; pub get)
- - (cd packages/flutter_tools/test/data/asset_test/font; pub get)
- - (cd dev/bots; pub get)
- - dart --enable-asserts ./dev/bots/test.dart
-
- - name: tool_tests-commands-macos
- only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter_tools/**', 'bin/**') || $CIRRUS_PR == ''"
- environment:
- SHOULD_UPDATE_PACKAGES: 'FALSE'
- script:
- - ulimit -S -n 2048 # https://github.com/flutter/flutter/issues/2976
- - (cd packages/flutter_tools; pub get)
- - (cd dev/bots; pub get)
- - dart --enable-asserts ./dev/bots/test.dart
-
- - name: tool_tests-integration-macos
- only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter_tools/**', 'bin/**') || $CIRRUS_PR == ''"
- environment:
- SHOULD_UPDATE_PACKAGES: 'FALSE'
- script:
- - ulimit -S -n 2048 # https://github.com/flutter/flutter/issues/2976
- - (cd packages/flutter_tools; pub get)
- - (cd dev/bots; pub get)
- - (cd dev/tools; pub get)
- - dart --enable-asserts ./dev/bots/test.dart
-
# TODO(ianh): Enable Web tests on macOS.
- - name: build_tests-0-macos
- only_if: "changesInclude('.cirrus.yml', 'dev/**', 'bin/**') || $CIRRUS_PR == ''" # https://github.com/flutter/flutter/issues/41940
- script:
- - ulimit -S -n 2048 # https://github.com/flutter/flutter/issues/2976
- - dart --enable-asserts ./dev/bots/test.dart
-
- - name: build_tests-1_last-macos
- only_if: "changesInclude('.cirrus.yml', 'dev/**', 'bin/**') || $CIRRUS_PR == ''" # https://github.com/flutter/flutter/issues/41940
- script:
- - ulimit -S -n 2048 # https://github.com/flutter/flutter/issues/2976
- - dart --enable-asserts ./dev/bots/test.dart
-
- name: hostonly_devicelab_tests-0-macos
<< : *MACOS_SHARD_TEMPLATE
diff --git a/dev/prod_builders.json b/dev/prod_builders.json
index cd1d8d5..be64ae0 100644
--- a/dev/prod_builders.json
+++ b/dev/prod_builders.json
@@ -67,6 +67,12 @@
"flaky":false
},
{
+ "name": "Mac build_tests",
+ "repo": "flutter",
+ "task_name": "mac_build_tests",
+ "flaky": false
+ },
+ {
"name": "Mac framework_tests",
"repo": "flutter",
"task_name": "mac_framework_tests",
diff --git a/dev/try_builders.json b/dev/try_builders.json
index ffe9362..9d56e5e 100644
--- a/dev/try_builders.json
+++ b/dev/try_builders.json
@@ -73,6 +73,13 @@
"run_if":["examples/hello_world/**" ,"dev/**", "packages/flutter/**", "packages/flutter_test/**", "packages/flutter_tools/lib/src/test/**", "packages/flutter_web_plugins/**", "bin/**"]
},
{
+ "name":"Mac build_tests",
+ "repo":"flutter",
+ "task_name":"mac_build_tests",
+ "enabled":true,
+ "run_if":["dev/**", "bin/**"]
+ },
+ {
"name":"Mac framework_tests",
"repo":"flutter",
"task_name":"mac_framework_tests",
