From 7623362fc6c310d2fbea1dd332e05b4415030b7b Mon Sep 17 00:00:00 2001 From: Simon Binder Date: Wed, 29 Jul 2020 11:28:55 +0200 Subject: [PATCH] Don't test moor_ffi in CI We don't have Flutter in the CI, and the package is deprecated. --- .cirrus.yml | 1 - extras/coverage_formatting/bin/coverage.dart | 1 - moor/test/database_test.dart | 4 ++-- tool/analyze.sh | 10 +++++----- tool/pub_get.sh | 16 ++++++++-------- tool/test_moor_ffi.sh | 5 ----- 6 files changed, 15 insertions(+), 22 deletions(-) delete mode 100755 tool/test_moor_ffi.sh diff --git a/.cirrus.yml b/.cirrus.yml index 9deac289..f3ba2dec 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -14,7 +14,6 @@ task: analyze_script: tool/analyze.sh test_moor_script: tool/test_moor.sh test_sqlparser_script: tool/test_sqlparser.sh - test_moor_ffi_script: tool/test_moor_ffi.sh misc_integration_test_script: tool/misc_integration_test.sh test_moor_generator_script: tool/test_generator.sh format_coverage_script: tool/upload_coverage.sh \ No newline at end of file diff --git a/extras/coverage_formatting/bin/coverage.dart b/extras/coverage_formatting/bin/coverage.dart index ba3202e9..2fa992b1 100644 --- a/extras/coverage_formatting/bin/coverage.dart +++ b/extras/coverage_formatting/bin/coverage.dart @@ -21,7 +21,6 @@ Future main() async { } await runForProject('moor'); - await runForProject('moor_ffi'); await runForProject('sqlparser'); } diff --git a/moor/test/database_test.dart b/moor/test/database_test.dart index 3f361aa2..e949bf0b 100644 --- a/moor/test/database_test.dart +++ b/moor/test/database_test.dart @@ -11,10 +11,10 @@ class _FakeDb extends GeneratedDatabase { MigrationStrategy get migration { return MigrationStrategy( onCreate: (m) async { - await m.issueCustomQuery('created'); + await customStatement('created'); }, onUpgrade: (m, from, to) async { - await m.issueCustomQuery('updated from $from to $to'); + await customStatement('updated from $from to $to'); }, beforeOpen: (details) async { // this fake select query is verified via mocks diff --git a/tool/analyze.sh b/tool/analyze.sh index 9c2d67e0..92f6baf5 100755 --- a/tool/analyze.sh +++ b/tool/analyze.sh @@ -15,11 +15,11 @@ cd .. #dartanalyzer --options analysis_options.yaml --fatal-infos --fatal-warnings lib/ || EXIT_CODE=$? #cd .. -cd moor_ffi -echo $(pwd) -dartfmt -n --set-exit-if-changed . || EXIT_CODE=$? -dartanalyzer --options analysis_options.yaml --fatal-infos --fatal-warnings lib/ test/ || EXIT_CODE=$? -cd .. +#cd moor_ffi +#echo $(pwd) +#dartfmt -n --set-exit-if-changed . || EXIT_CODE=$? +#dartanalyzer --options analysis_options.yaml --fatal-infos --fatal-warnings lib/ test/ || EXIT_CODE=$? +#cd .. cd moor_generator echo $(pwd) diff --git a/tool/pub_get.sh b/tool/pub_get.sh index 93ff022c..dfa7b5b2 100755 --- a/tool/pub_get.sh +++ b/tool/pub_get.sh @@ -5,10 +5,10 @@ echo $(pwd) pub upgrade cd .. -cd moor_flutter -echo $(pwd) -flutter packages upgrade -cd .. +#cd moor_flutter +#echo $(pwd) +#flutter packages upgrade +#cd .. cd moor_generator echo $(pwd) @@ -20,7 +20,7 @@ echo $(pwd) pub upgrade cd .. -cd moor_ffi -echo $(pwd) -flutter packages upgrade -cd .. \ No newline at end of file +#cd moor_ffi +#echo $(pwd) +#flutter packages upgrade +#cd .. \ No newline at end of file diff --git a/tool/test_moor_ffi.sh b/tool/test_moor_ffi.sh deleted file mode 100755 index df9bc3e4..00000000 --- a/tool/test_moor_ffi.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -cd moor_ffi - -flutter packages run test --coverage=coverage \ No newline at end of file