Skip to content

Commit 63cf7a3

Browse files
authored
Update CI (#793)
1 parent 495a4ca commit 63cf7a3

27 files changed

+41
-35
lines changed

.github/workflows/build.yml

+29-4
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,50 @@
11
name: Build
22

33
on:
4-
push:
54
pull_request:
5+
paths-ignore:
6+
- "**.md"
7+
push:
8+
branches:
9+
- master
10+
paths-ignore:
11+
- "**.md"
612
schedule:
713
# runs the CI everyday at 10AM
814
- cron: "0 10 * * *"
915

1016
jobs:
1117
flutter:
1218
runs-on: ubuntu-latest
13-
container: cirrusci/flutter:${{matrix.channel}}
1419

1520
strategy:
1621
matrix:
1722
channel:
23+
- master
1824
- dev
1925
- beta
2026

2127
steps:
2228
- uses: actions/checkout@v2
29+
- uses: actions/[email protected]
30+
with:
31+
fetch-depth: 2
32+
33+
- uses: subosito/[email protected]
34+
with:
35+
channel: ${{ matrix.channel }}
36+
37+
- name: Add pub cache bin to PATH
38+
run: echo "$HOME/.pub-cache/bin" >> $GITHUB_PATH
39+
- name: Add pub cache to PATH
40+
run: echo "PUB_CACHE="$HOME/.pub-cache"" >> $GITHUB_ENV
41+
42+
- name: Install dependencies
43+
run: flutter pub get
44+
45+
- run: flutter format lib test --set-exit-if-changed
46+
- run: flutter analyze --no-current-package
2347

24-
- name: Execute test script
25-
run: curl -s https://raw.githubusercontent.com/rrousselGit/ci/master/scripts/ci.sh | bash -s nnbd
48+
- run: flutter test --no-pub --coverage test/null_safe
49+
- run: flutter test --no-pub --coverage --no-sound-null-safety test/mixed_mode
50+
if: matrix.package_path != 'master'

example/test_driver/app_test.dart

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// ignore: import_of_legacy_library_into_null_safe
21
import 'package:flutter_driver/flutter_driver.dart';
32
import 'package:test/test.dart';
43

scripts/flutter_test.sh

-9
This file was deleted.
File renamed without changes.

test/inherited_provider_legacy_test.dart renamed to test/mixed_mode/inherited_provider_legacy_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import 'package:flutter/widgets.dart';
44
import 'package:flutter_test/flutter_test.dart';
55
import 'package:provider/provider.dart';
66

7-
import 'common.dart';
7+
import '../null_safe/common.dart';
88

99
BuildContext get context => find.byType(Context).evaluate().single;
1010

test/provider_legacy_test.dart renamed to test/mixed_mode/provider_legacy_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import 'package:flutter/widgets.dart';
44
import 'package:flutter_test/flutter_test.dart';
55
import 'package:provider/provider.dart';
66

7-
import 'common.dart';
7+
import '../null_safe/common.dart';
88

99
void main() {
1010
// See `provider_test.dart` for corresponding sound mode test.
File renamed without changes.

test/common.dart renamed to test/null_safe/common.dart

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import 'dart:async';
33
import 'package:flutter/foundation.dart';
44
import 'package:flutter/widgets.dart';
55
import 'package:flutter_test/flutter_test.dart';
6-
// ignore: import_of_legacy_library_into_null_safe
76
import 'package:mockito/mockito.dart';
87
import 'package:provider/provider.dart';
98

test/consumer_test.dart renamed to test/null_safe/consumer_test.dart

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import 'package:flutter/material.dart';
22
import 'package:flutter_test/flutter_test.dart';
3-
// ignore: import_of_legacy_library_into_null_safe
43
import 'package:mockito/mockito.dart';
54
import 'package:provider/provider.dart';
65

test/context_test.dart renamed to test/null_safe/context_test.dart

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import 'package:flutter/widgets.dart';
22
import 'package:flutter_test/flutter_test.dart';
3-
// ignore: import_of_legacy_library_into_null_safe
43
import 'package:mockito/mockito.dart';
54
import 'package:provider/provider.dart';
65

File renamed without changes.

test/future_provider_test.dart renamed to test/null_safe/future_provider_test.dart

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import 'dart:async';
22

33
import 'package:flutter/widgets.dart';
44
import 'package:flutter_test/flutter_test.dart';
5-
// ignore: import_of_legacy_library_into_null_safe
65
import 'package:mockito/mockito.dart';
76
import 'package:provider/provider.dart';
87

test/inherited_provider_test.dart renamed to test/null_safe/inherited_provider_test.dart

+10-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import 'package:flutter/widgets.dart';
22
import 'package:flutter_test/flutter_test.dart';
33

4-
// ignore: import_of_legacy_library_into_null_safe
54
import 'package:mockito/mockito.dart';
65
import 'package:provider/provider.dart';
76
import 'package:provider/single_child_widget.dart';
@@ -554,7 +553,8 @@ The context used was: Context
554553
),
555554
);
556555

557-
final rootElement = tester.element(find.bySubtype<InheritedProvider>());
556+
final rootElement =
557+
tester.element(find.byWidgetPredicate((w) => w is InheritedProvider));
558558

559559
expect(
560560
rootElement.toString(),
@@ -583,7 +583,8 @@ The context used was: Context
583583
),
584584
);
585585

586-
final rootElement = tester.element(find.bySubtype<InheritedProvider>());
586+
final rootElement =
587+
tester.element(find.byWidgetPredicate((w) => w is InheritedProvider));
587588

588589
expect(
589590
rootElement.toString(),
@@ -607,7 +608,8 @@ The context used was: Context
607608
),
608609
);
609610

610-
final rootElement = tester.element(find.bySubtype<InheritedProvider>());
611+
final rootElement =
612+
tester.element(find.byWidgetPredicate((w) => w is InheritedProvider));
611613

612614
expect(
613615
rootElement.toString(),
@@ -634,8 +636,8 @@ The context used was: Context
634636
),
635637
);
636638

637-
final rootElement =
638-
tester.element(find.bySubtype<DeferredInheritedProvider>());
639+
final rootElement = tester.element(
640+
find.byWidgetPredicate((w) => w is DeferredInheritedProvider));
639641

640642
expect(
641643
rootElement.toString(),
@@ -666,7 +668,8 @@ DeferredInheritedProvider<int, int>(controller: 42, value: 24)'''),
666668
),
667669
);
668670

669-
final rootElement = tester.element(find.bySubtype<InheritedProvider>());
671+
final rootElement =
672+
tester.element(find.byWidgetPredicate((w) => w is InheritedProvider));
670673

671674
expect(
672675
rootElement.toString(),

test/listenable_provider_test.dart renamed to test/null_safe/listenable_provider_test.dart

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// ignore_for_file: invalid_use_of_protected_member
22
import 'package:flutter/widgets.dart';
33
import 'package:flutter_test/flutter_test.dart';
4-
// ignore: import_of_legacy_library_into_null_safe
54
import 'package:mockito/mockito.dart';
65
import 'package:provider/provider.dart';
76

test/listenable_proxy_provider_test.dart renamed to test/null_safe/listenable_proxy_provider_test.dart

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// ignore_for_file: invalid_use_of_protected_member
22
import 'package:flutter/widgets.dart';
33
import 'package:flutter_test/flutter_test.dart';
4-
// ignore: import_of_legacy_library_into_null_safe
54
import 'package:mockito/mockito.dart';
65
import 'package:provider/provider.dart';
76

File renamed without changes.
File renamed without changes.

test/proxy_provider_test.dart renamed to test/null_safe/proxy_provider_test.dart

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import 'package:flutter/widgets.dart';
22
import 'package:flutter_test/flutter_test.dart';
3-
// ignore: import_of_legacy_library_into_null_safe
43
import 'package:mockito/mockito.dart';
54
import 'package:provider/provider.dart';
65

File renamed without changes.

test/selector_test.dart renamed to test/null_safe/selector_test.dart

-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import 'package:flutter/foundation.dart';
22
import 'package:flutter/material.dart';
33
import 'package:flutter_test/flutter_test.dart';
4-
// ignore: import_of_legacy_library_into_null_safe
54
import 'package:mockito/mockito.dart' as mockito show when;
6-
// ignore: import_of_legacy_library_into_null_safe
75
import 'package:mockito/mockito.dart';
86
import 'package:provider/provider.dart';
97
import 'package:provider/single_child_widget.dart';

test/stateful_provider_test.dart renamed to test/null_safe/stateful_provider_test.dart

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import 'package:flutter/widgets.dart';
22
import 'package:flutter_test/flutter_test.dart';
3-
// ignore: import_of_legacy_library_into_null_safe
43
import 'package:mockito/mockito.dart';
54
import 'package:provider/provider.dart';
65
import 'package:provider/src/provider.dart';

test/stream_provider_test.dart renamed to test/null_safe/stream_provider_test.dart

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import 'dart:async';
22

33
import 'package:flutter/widgets.dart';
44
import 'package:flutter_test/flutter_test.dart';
5-
// ignore: import_of_legacy_library_into_null_safe
65
import 'package:mockito/mockito.dart';
76
import 'package:provider/provider.dart';
87

test/value_listenable_test.dart renamed to test/null_safe/value_listenable_test.dart

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import 'package:flutter/foundation.dart';
22
import 'package:flutter/widgets.dart';
33
import 'package:flutter_test/flutter_test.dart';
4-
// ignore: import_of_legacy_library_into_null_safe
54
import 'package:mockito/mockito.dart';
65
import 'package:provider/provider.dart';
76

0 commit comments

Comments
 (0)