diff --git a/.github/workflows/dart_ci.yml b/.github/workflows/dart_ci.yml index f620b616..d6be5863 100644 --- a/.github/workflows/dart_ci.yml +++ b/.github/workflows/dart_ci.yml @@ -2,9 +2,12 @@ name: Dart CI on: push: - branches: [ master ] + branches: + - 'master' + - 'test_consume_*' pull_request: - branches: [ master ] + branches: + - '*' jobs: build: @@ -32,18 +35,20 @@ jobs: - name: Verify formatting run: dart format --output=none --line-length=120 --set-exit-if-changed . - if: always() && ${{ matrix.sdk }} == 'stable' && steps.install.outcome == 'success' + if: ${{ matrix.sdk == '2.13.4' }} - name: Analyze project source run: dart analyze if: always() && steps.install.outcome == 'success' - name: Run tests (DDC) - run: dart pub run build_runner test -- --preset dartdevc + run: | + if [ ${{ matrix.sdk }} = '2.13.4' ]; then dart run build_runner test -- --preset dartdevc-legacy; else dart run build_runner test -- --preset dartdevc; fi if: always() && steps.install.outcome == 'success' timeout-minutes: 5 - name: Run tests (dart2js) - run: dart pub run build_runner test --release -- --preset dart2js + run: | + if [ ${{ matrix.sdk }} = '2.13.4' ]; then dart run build_runner test -- --preset dart2js-legacy; else dart run build_runner test -- --preset dart2js; fi if: always() && steps.install.outcome == 'success' timeout-minutes: 5 diff --git a/dart_test.yaml b/dart_test.yaml index f610cad4..d5effb76 100644 --- a/dart_test.yaml +++ b/dart_test.yaml @@ -5,12 +5,18 @@ platforms: - vm presets: - dart2js: + dart2js-legacy: exclude_tags: no-dart2js - dartdevc: + dartdevc-legacy: exclude_tags: no-dartdevc + dart2js: + exclude_tags: "no-dart2js || no-sdk-2-14-plus" + + dartdevc: + exclude_tags: "no-dartdevc || no-sdk-2-14-plus" + tags: # Variadic children tests of >5 children that fail in Dart 2.7 for an unknown reason, seemingly an SDK bug. # These tests pass in later Dart SDKs, so we ignore them when running in 2.7. diff --git a/pubspec.yaml b/pubspec.yaml index fe9d1777..cf8d3aa3 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -6,17 +6,13 @@ environment: sdk: ">=2.11.0 <3.0.0" dependencies: js: ^0.6.0 - meta: ">=1.1.6 <1.7.0" # Workaround to avoid https://github.com/dart-lang/sdk/issues/46142 + meta: ^1.1.6 dev_dependencies: - args: ^1.5.1 - build_runner: ^1.6.5 - build_test: ^0.10.8 - build_web_compilers: ^2.12.0 - dependency_validator: ^2.0.0 + args: ">=1.5.1 <3.0.0" + build_runner: ">=1.6.5 <3.0.0" + build_test: ">=0.10.8 <3.0.0" + build_web_compilers: ">=2.12.0 <4.0.0" + dependency_validator: ">=2.0.0 <4.0.0" matcher: ^0.12.5 mockito: ">=4.1.1 <6.0.0" test: ^1.6.5 - -dependency_validator: - ignore: - - meta # ignore the pin for now \ No newline at end of file diff --git a/test/js_builds/shared_tests.dart b/test/js_builds/shared_tests.dart index 7fe2d01f..4d51e254 100644 --- a/test/js_builds/shared_tests.dart +++ b/test/js_builds/shared_tests.dart @@ -129,7 +129,7 @@ void sharedConsoleWarnTests({@required bool expectDeduplicateSyntheticEventWarni ]); }); } - }, tags: 'no-dart2js'); + }, tags: ['no-dart2js', 'no-sdk-2-14-plus']); test('logs other duplicate messages properly', () { consoleWarn('foo');