DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Only run web mac tests on macOS 12 (flutter/engine#46965)

Browse Source 
Web Mac tests currently fail on macOS 13 (https://github.com/flutter/flutter/issues/136274, https://github.com/flutter/flutter/issues/136279) so we limit CI to only run on macOS 12.

[C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
This commit is contained in:
Victoria Ashworth 2023-10-17 09:59:05 -05:00 committed by GitHub
parent dc122dc6b7
commit ebe2cf39ca
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engine/src/flutter/ci/builders/linux_web_engine.json
View File

@ -1,6 +1,6 @@
{
"_comment": "THIS IS A GENERATED FILE. Do not edit this file directly.",
"_comment2": "See `generated_builder_json.dart` for the generator code",
"_comment2": "See `generate_builder_json.dart` for the generator code",
"builds": [
{
"name": "web_tests/artifacts",
@ -1095,7 +1095,7 @@
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
"os=Mac"
"os=Mac-12"
],
"gclient_variables": {
"download_android_deps": false
@ -1127,7 +1127,7 @@
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
"os=Mac"
"os=Mac-12"
],
"gclient_variables": {
"download_android_deps": false
@ -1159,7 +1159,7 @@
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
"os=Mac"
"os=Mac-12"
],
"gclient_variables": {
"download_android_deps": false
@ -1191,7 +1191,7 @@
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
"os=Mac"
"os=Mac-12"
],
"gclient_variables": {
"download_android_deps": false
@ -1223,7 +1223,7 @@
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
"os=Mac"
"os=Mac-12"
],
"gclient_variables": {
"download_android_deps": false

13
engine/src/flutter/lib/web_ui/dev/generate_builder_json.dart
View File

@ -9,7 +9,7 @@ import 'felt_config.dart';
String generateBuilderJson(FeltConfig config) {
final Map<String, dynamic> outputJson = <String, dynamic>{
'_comment': 'THIS IS A GENERATED FILE. Do not edit this file directly.',
'_comment2': 'See `generated_builder_json.dart` for the generator code',
'_comment2': 'See `generate_builder_json.dart` for the generator code',
'builds': <dynamic>[
_getArtifactBuildStep(),
for (final TestBundle bundle in config.testBundles)
@ -113,7 +113,10 @@ Iterable<dynamic> _getAllTestSteps(List<TestSuite> suites) {
suite.runConfig.browser == BrowserName.chrome ||
suite.runConfig.browser == BrowserName.firefox
),
..._getTestStepsForPlatform(suites, 'Mac', (TestSuite suite) =>
// TODO(jacksongardner): Stop filtering to Mac-12 after macOS 13 issues are fixed:
// https://github.com/flutter/flutter/issues/136274,
// https://github.com/flutter/flutter/issues/136279
..._getTestStepsForPlatform(suites, 'Mac', specificOS: 'Mac-12', (TestSuite suite) =>
suite.runConfig.browser == BrowserName.safari
),
..._getTestStepsForPlatform(suites, 'Windows', (TestSuite suite) =>
@ -129,7 +132,9 @@ Iterable<dynamic> _getAllTestSteps(List<TestSuite> suites) {
Iterable<dynamic> _getTestStepsForPlatform(
List<TestSuite> suites,
String platform,
bool Function(TestSuite suite) filter) {
bool Function(TestSuite suite) filter, {
String? specificOS,
}) {
return suites
.where(filter)
.map((TestSuite suite) => <String, dynamic>{
@ -137,7 +142,7 @@ Iterable<dynamic> _getTestStepsForPlatform(
'recipe': 'engine_v2/tester_engine',
'drone_dimensions': <String>[
'device_type=none',
'os=$platform',
'os=${specificOS ?? platform}',
],
'gclient_variables': <String, dynamic>{
'download_android_deps': false,