Skip to content

Commit

Permalink
[ci] Manual roll Flutter to c246ecd (84 revisions) + fixes (flutter#6863
Browse files Browse the repository at this point in the history
)

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 flutter/packages#6861
  • Loading branch information
ditman authored Jun 4, 2024
1 parent c472e40 commit 84fd510
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .ci/flutter_master.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c85fa6abf4ffe253109bc5cac762e46d1853d325
c246ecdf8e8d564410698e86cc07e853269ebab8
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 8 additions & 4 deletions packages/flutter_markdown/test/image_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import 'package:flutter_test/flutter_test.dart';
import 'image_test_mocks.dart';
import 'utils.dart';

bool isRunningInStable = io.Platform.environment['CHANNEL'] == 'stable';

void main() => defineTests();

void defineTests() {
Expand Down Expand Up @@ -167,8 +169,9 @@ void defineTests() {

await expectLater(
find.byType(Container),
matchesGoldenFile(
'assets/images/golden/image_test/resource_asset_logo.png'));
matchesGoldenFile(isRunningInStable
? 'assets/images/golden/image_test/resource_asset_logo_old.png'
: 'assets/images/golden/image_test/resource_asset_logo.png'));
},
skip: kIsWeb, // Goldens are platform-specific.
);
Expand Down Expand Up @@ -413,8 +416,9 @@ void defineTests() {

await expectLater(
find.byType(Container),
matchesGoldenFile(
'assets/images/golden/image_test/custom_builder_asset_logo.png'));
matchesGoldenFile(isRunningInStable
? 'assets/images/golden/image_test/custom_builder_asset_logo_old.png'
: 'assets/images/golden/image_test/custom_builder_asset_logo.png'));
},
skip: kIsWeb, // Goldens are platform-specific.
);
Expand Down

0 comments on commit 84fd510

Please sign in to comment.