Skip to content

Commit 79191a7

Browse files
[wip]
1 parent 8766c62 commit 79191a7

File tree

4 files changed

+26
-15
lines changed

4 files changed

+26
-15
lines changed

.github/workflows/dart_ci.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@ name: Dart CI
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches:
6+
- 'master'
7+
- 'test_consume_*'
68
pull_request:
7-
branches: [ master ]
9+
branches:
10+
- '*'
811

912
jobs:
1013
build:
@@ -32,18 +35,20 @@ jobs:
3235

3336
- name: Verify formatting
3437
run: dart format --output=none --line-length=120 --set-exit-if-changed .
35-
if: always() && ${{ matrix.sdk }} == 'stable' && steps.install.outcome == 'success'
38+
if: ${{ matrix.sdk == '2.13.4' }} && steps.install.outcome == 'success'
3639

3740
- name: Analyze project source
3841
run: dart analyze
3942
if: always() && steps.install.outcome == 'success'
4043

4144
- name: Run tests (DDC)
42-
run: dart pub run build_runner test -- --preset dartdevc
45+
run: |
46+
if [ ${{ matrix.sdk }} = '2.13.4' ]; then dart run build_runner test -- --preset dartdevc-legacy; else dart run build_runner test -- --preset dartdevc; fi
4347
if: always() && steps.install.outcome == 'success'
4448
timeout-minutes: 5
4549

4650
- name: Run tests (dart2js)
47-
run: dart pub run build_runner test --release -- --preset dart2js
51+
run: |
52+
if [ ${{ matrix.sdk }} = '2.13.4' ]; then dart run build_runner test -- --preset dart2js-legacy; else dart run build_runner test -- --preset dart2js; fi
4853
if: always() && steps.install.outcome == 'success'
4954
timeout-minutes: 5

dart_test.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,18 @@ platforms:
55
- vm
66

77
presets:
8-
dart2js:
8+
dart2js-legacy:
99
exclude_tags: no-dart2js
1010

11-
dartdevc:
11+
dartdevc-legacy:
1212
exclude_tags: no-dartdevc
1313

14+
dart2js:
15+
exclude_tags: no-dart2js && no-sdk-2-14-plus
16+
17+
dartdevc:
18+
exclude_tags: no-dartdevc && no-sdk-2-14-plus
19+
1420
tags:
1521
# Variadic children tests of >5 children that fail in Dart 2.7 for an unknown reason, seemingly an SDK bug.
1622
# These tests pass in later Dart SDKs, so we ignore them when running in 2.7.

pubspec.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ environment:
66
sdk: ">=2.11.0 <3.0.0"
77
dependencies:
88
js: ^0.6.0
9-
meta: ">=1.1.6 <1.7.0" # Workaround to avoid https://github.com/dart-lang/sdk/issues/46142
9+
meta: ^1.1.6
1010
dev_dependencies:
11-
args: ^1.5.1
12-
build_runner: ^1.6.5
13-
build_test: ^0.10.8
14-
build_web_compilers: ^2.12.0
15-
dependency_validator: ^2.0.0
11+
args: ">=1.5.1 <3.0.0"
12+
build_runner: ">=1.6.5 <3.0.0"
13+
build_test: ">=0.10.8 <3.0.0"
14+
build_web_compilers: ">=2.12.0 <4.0.0"
15+
dependency_validator: ">=2.0.0 <4.0.0"
1616
matcher: ^0.12.5
1717
mockito: ">=4.1.1 <6.0.0"
1818
test: ^1.6.5
1919

2020
dependency_validator:
2121
ignore:
22-
- meta # ignore the pin for now
22+
- meta # ignore the pin for now

test/js_builds/shared_tests.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ void sharedConsoleWarnTests({@required bool expectDeduplicateSyntheticEventWarni
129129
]);
130130
});
131131
}
132-
}, tags: 'no-dart2js');
132+
}, tags: ['no-dart2js', 'no-sdk-2-14-plus']);
133133

134134
test('logs other duplicate messages properly', () {
135135
consoleWarn('foo');

0 commit comments

Comments
 (0)