From 1b780a7bf8abd14974b47e82db3292ba3352f19f Mon Sep 17 00:00:00 2001 From: wasabeef Date: Sat, 20 Feb 2021 04:37:19 +0900 Subject: [PATCH 1/5] chore(coverage): replace plugin --- .gitignore | 1 + Makefile | 2 +- packages/core/pubspec.lock | 16 ---------------- packages/core/pubspec.yaml | 2 -- scripts/coverage.sh | 9 +++++++++ 5 files changed, 11 insertions(+), 19 deletions(-) create mode 100755 scripts/coverage.sh diff --git a/.gitignore b/.gitignore index 726736164..131162d81 100644 --- a/.gitignore +++ b/.gitignore @@ -109,6 +109,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/scripts/coverage.sh b/scripts/coverage.sh new file mode 100755 index 000000000..1bb1ba9b9 --- /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 \ No newline at end of file From dac19d585ff34ecafc84777cd3699a4866ecc9db Mon Sep 17 00:00:00 2001 From: wasabeef Date: Sat, 20 Feb 2021 04:54:27 +0900 Subject: [PATCH 2/5] build(ci): add env --- .github/workflows/dart-ci.yaml | 3 +++ 1 file changed, 3 insertions(+) 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 From c9d56aecf7cc0c9e2c74aaa7c1b065d0dedc14cc Mon Sep 17 00:00:00 2001 From: Daichi Furiya Date: Sat, 20 Feb 2021 13:46:18 +0900 Subject: [PATCH 3/5] chore: add new-line --- scripts/coverage.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/coverage.sh b/scripts/coverage.sh index 1bb1ba9b9..0d9c74c89 100755 --- a/scripts/coverage.sh +++ b/scripts/coverage.sh @@ -6,4 +6,4 @@ 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 \ No newline at end of file +format_coverage --lcov --in=coverage --out=coverage.lcov --packages=.packages --report-on=lib From 2408283e0ed5592db1b9cf83b39f7b9651717983 Mon Sep 17 00:00:00 2001 From: wasabeef Date: Sat, 20 Feb 2021 13:52:37 +0900 Subject: [PATCH 4/5] chore: delete unused setting --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 131162d81..3b1dc9127 100644 --- a/.gitignore +++ b/.gitignore @@ -108,7 +108,6 @@ node_modules/ ## Test coverage coverage/ -**/test/.test_coverage.dart coverage.lcov ## Test resources From 3b6685db8556ef3eeaf20ba85c4601d53ed8864d Mon Sep 17 00:00:00 2001 From: wasabeef Date: Sat, 20 Feb 2021 15:00:04 +0900 Subject: [PATCH 5/5] chore(test): remove unused file --- packages/core/test/.test_coverage.dart | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 packages/core/test/.test_coverage.dart 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(); -}