diff --git a/.github/workflows/dart-ci.yaml b/.github/workflows/dart-ci.yaml index 5ef5eb6d7..f48fd7930 100644 --- a/.github/workflows/dart-ci.yaml +++ b/.github/workflows/dart-ci.yaml @@ -19,6 +19,9 @@ jobs: with: channel: 'stable' + - name: Set environment + run: echo "$HOME/.pub-cache/bin" >> $GITHUB_PATH + - name: Get dart dependencies. run: make dependencies diff --git a/.gitignore b/.gitignore index 726736164..3b1dc9127 100644 --- a/.gitignore +++ b/.gitignore @@ -108,7 +108,7 @@ node_modules/ ## Test coverage coverage/ -**/test/.test_coverage.dart +coverage.lcov ## Test resources **/test_resources/lib diff --git a/Makefile b/Makefile index 399538331..22d7e743e 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ unit-test: cd packages/core/ && dart pub run test && cd .. coverage: - cd packages/core/ && dart pub run test_coverage --no-badge && cd .. + ./scripts/coverage.sh packages/core ./scripts/codecov.sh ${CODECOV_TOKEN} setup-ubuntu: diff --git a/packages/core/pubspec.lock b/packages/core/pubspec.lock index 84a518bd0..dac81bfa8 100644 --- a/packages/core/pubspec.lock +++ b/packages/core/pubspec.lock @@ -267,13 +267,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "3.5.1" - lcov: - dependency: transitive - description: - name: lcov - url: "https://pub.dartlang.org" - source: hosted - version: "5.7.0" logging: dependency: transitive description: @@ -498,15 +491,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.3.11+4" - test_coverage: - dependency: "direct dev" - description: - path: "." - ref: HEAD - resolved-ref: d51c9577f78893e1654de8b7c1e92d2f8097838a - url: "https://github.com/shyndman/test-coverage.git" - source: git - version: "0.4.0" time: dependency: transitive description: diff --git a/packages/core/pubspec.yaml b/packages/core/pubspec.yaml index 5103de155..97189a00e 100644 --- a/packages/core/pubspec.yaml +++ b/packages/core/pubspec.yaml @@ -27,8 +27,6 @@ dependencies: dev_dependencies: test: ^1.15.7 - test_coverage: - git: https://github.com/shyndman/test-coverage.git # TODO: https://github.com/pulyaevskiy/test-coverage/issues/14 effective_dart: ^1.3.0 build_runner: ^1.11.1 json_serializable: ^3.5.1 diff --git a/packages/core/test/.test_coverage.dart b/packages/core/test/.test_coverage.dart deleted file mode 100644 index 9bae54434..000000000 --- a/packages/core/test/.test_coverage.dart +++ /dev/null @@ -1,18 +0,0 @@ -// Auto-generated by test_coverage. Do not edit by hand. -// Consider adding this file to your .gitignore. - -import 'assets_gen_integrations_test.dart' as assets_gen_integrations_test; -import 'assets_gen_test.dart' as assets_gen_test; -import 'colors_gen_test.dart' as colors_gen_test; -import 'config_test.dart' as config_test; -import 'flutter_gen_test.dart' as flutter_gen_test; -import 'fonts_gen_test.dart' as fonts_gen_test; - -void main() { - config_test.main(); - flutter_gen_test.main(); - assets_gen_integrations_test.main(); - fonts_gen_test.main(); - assets_gen_test.main(); - colors_gen_test.main(); -} diff --git a/scripts/coverage.sh b/scripts/coverage.sh new file mode 100755 index 000000000..0d9c74c89 --- /dev/null +++ b/scripts/coverage.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +set -o pipefail + +DIR="${1}" +cd ${DIR} +dart pub global activate coverage +dart test --coverage="coverage" +format_coverage --lcov --in=coverage --out=coverage.lcov --packages=.packages --report-on=lib