From: Mikhail Galanin <mgalanin@mimecast.com>
Date: Tue, 25 Sep 2018 15:53:34 +0000 (+0100)
Subject: [Minor] collect coverage when all tests are over
X-Git-Tag: 1.8.1~155^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d659f9172326059539c99d315a91d48dc91fe1ed;p=thirdparty%2Frspamd.git

[Minor] collect coverage when all tests are over
---

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1ac0e01e5f..19a1c4a8ec 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -85,9 +85,6 @@ jobs:
           key: coverage-{{ .Environment.CIRCLE_WORKFLOW_ID }}
           paths:
             - coverage.rspamd-test.info
-      - *restore_coverage_data
-
-      - *merge_and_upload_coverage_data
 
       - run: (exit $RETURN_CODE)
 
@@ -118,9 +115,6 @@ jobs:
           key: coverage-{{ .Environment.CIRCLE_WORKFLOW_ID }}
           paths:
             - coverage.functional.info
-      - *restore_coverage_data
-
-      - *merge_and_upload_coverage_data
 
       - store_artifacts:
           path: output.xml
@@ -152,6 +146,12 @@ jobs:
           key: v1-dependencies-{{ checksum "package.json" }}
       - run: ./node_modules/.bin/eslint -v && ./node_modules/.bin/eslint ./
 
+  send-coverage:
+    <<: *defaults
+    steps:
+      - *restore_coverage_data
+      - *merge_and_upload_coverage_data
+
 workflows:
   version: 2
   build-and-test:
@@ -164,3 +164,7 @@ workflows:
       - functional:
           requires:
             - build
+      - send-coverage:
+          requires:
+            - rspamd-test
+            - functional