Skip to content

Commit 84fd510

Browse files
authored
[ci] Manual roll Flutter to c246ecd (84 revisions) + fixes (#6863)
Updates the flutter master version and adds fixes for broken stuff. * [flutter_markdown] Updates a test image used as a golden file. * ~~[google_maps_flutter_android]~~ Flaky test/fixed OOB. ## Issues * Completes #6861
1 parent c472e40 commit 84fd510

File tree

6 files changed

+9
-5
lines changed

6 files changed

+9
-5
lines changed

.ci/flutter_master.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
c85fa6abf4ffe253109bc5cac762e46d1853d325
1+
c246ecdf8e8d564410698e86cc07e853269ebab8
5.79 KB
Loading
18.6 KB
Loading
5.79 KB
Loading
18.6 KB
Loading

packages/flutter_markdown/test/image_test.dart

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ import 'package:flutter_test/flutter_test.dart';
1313
import 'image_test_mocks.dart';
1414
import 'utils.dart';
1515

16+
bool isRunningInStable = io.Platform.environment['CHANNEL'] == 'stable';
17+
1618
void main() => defineTests();
1719

1820
void defineTests() {
@@ -167,8 +169,9 @@ void defineTests() {
167169

168170
await expectLater(
169171
find.byType(Container),
170-
matchesGoldenFile(
171-
'assets/images/golden/image_test/resource_asset_logo.png'));
172+
matchesGoldenFile(isRunningInStable
173+
? 'assets/images/golden/image_test/resource_asset_logo_old.png'
174+
: 'assets/images/golden/image_test/resource_asset_logo.png'));
172175
},
173176
skip: kIsWeb, // Goldens are platform-specific.
174177
);
@@ -413,8 +416,9 @@ void defineTests() {
413416

414417
await expectLater(
415418
find.byType(Container),
416-
matchesGoldenFile(
417-
'assets/images/golden/image_test/custom_builder_asset_logo.png'));
419+
matchesGoldenFile(isRunningInStable
420+
? 'assets/images/golden/image_test/custom_builder_asset_logo_old.png'
421+
: 'assets/images/golden/image_test/custom_builder_asset_logo.png'));
418422
},
419423
skip: kIsWeb, // Goldens are platform-specific.
420424
);

0 commit comments

Comments
 (0)