From 47a032c645dcd5ecdc6509822ea4449d974141fd Mon Sep 17 00:00:00 2001
From: Simon Binder <oss@simonbinder.eu>
Date: Sun, 28 Jul 2019 10:32:31 +0200
Subject: [PATCH] Move coverage uploading into same Cirrus task

---
 .cirrus.yml                    |  7 +------
 moor/tool/format_coverage.dart | 10 ++--------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index ad52a97f..956c4f58 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -3,15 +3,10 @@ container:
   image: "google/dart:latest"
 
 task:
-  name: Analysis and Tests
   pub_cache:
     folder: $HOME/.pub-cache
   pub_get_script: tool/pub_get.sh
   analyze_script: tool/analyze.sh
   test_moor_script: tool/test_moor.sh
   test_sqlparser_script: tool/test_sqlparser.sh
-
-upload_coverage_task:
-  name: Upload coverage
-  depends_on: [task]
-  format_coverage_script: tool/upload_coverage.sh
\ No newline at end of file
+  format_coverage_script: tool/upload_coverage.sh
diff --git a/moor/tool/format_coverage.dart b/moor/tool/format_coverage.dart
index 29dd6d60..81c6e277 100644
--- a/moor/tool/format_coverage.dart
+++ b/moor/tool/format_coverage.dart
@@ -9,16 +9,10 @@ Future main() async {
     packagesPath: 'moor/.packages',
   );
 
-  final potentialFiles = [
+  final coverage = await parseCoverage([
     File('moor/coverage.json'),
     File('sqlparser/coverage.json'),
-  ];
-
-  final existingFiles = [
-    for (var file in potentialFiles) if (file.existsSync()) file
-  ];
-
-  final coverage = await parseCoverage(existingFiles, 1);
+  ], 1);
 
   // report coverage for the moor and moor_generator package
   final lcov = await LcovFormatter(