From eab85fc291403e316d079037841719d0c70a3cb3 Mon Sep 17 00:00:00 2001
From: Ankush Menat <ankush@frappe.io>
Date: Sat, 13 Aug 2022 18:18:11 +0530
Subject: [PATCH] ci: stablilize coverage tracking

---
 .github/workflows/server-mariadb-tests.yml  | 20 +++++++-
 .github/workflows/server-postgres-tests.yml | 20 +++++++-
 .github/workflows/ui-tests.yml              | 57 +++++++++++++++------
 codecov.yml                                 | 14 +++--
 4 files changed, 88 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/server-mariadb-tests.yml b/.github/workflows/server-mariadb-tests.yml
index 051b657b0e..f5b87178ee 100644
--- a/.github/workflows/server-mariadb-tests.yml
+++ b/.github/workflows/server-mariadb-tests.yml
@@ -129,10 +129,26 @@ jobs:
 
       - name: Upload coverage data
         if: ${{ steps.check-build.outputs.build == 'strawberry' }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: coverage-${{ matrix.container }}
+          path: /home/runner/frappe-bench/sites/coverage.xml
+
+  coverage:
+    name: Coverage Wrap Up
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clone
+        uses: actions/checkout@v3
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v3
+
+      - name: Upload coverage data
         uses: codecov/codecov-action@v3
         with:
           name: MariaDB
           fail_ci_if_error: true
-          files: /home/runner/frappe-bench/sites/coverage.xml
           verbose: true
-          flags: server
+          flags: server-mariadb
diff --git a/.github/workflows/server-postgres-tests.yml b/.github/workflows/server-postgres-tests.yml
index 1d81f55802..d8f9a4bf99 100644
--- a/.github/workflows/server-postgres-tests.yml
+++ b/.github/workflows/server-postgres-tests.yml
@@ -132,10 +132,26 @@ jobs:
 
       - name: Upload coverage data
         if: ${{ steps.check-build.outputs.build == 'strawberry' }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: coverage-${{ matrix.container }}
+          path: /home/runner/frappe-bench/sites/coverage.xml
+
+  coverage:
+    name: Coverage Wrap Up
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clone
+        uses: actions/checkout@v3
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v3
+
+      - name: Upload coverage data
         uses: codecov/codecov-action@v3
         with:
           name: Postgres
           fail_ci_if_error: true
-          files: /home/runner/frappe-bench/sites/coverage.xml
           verbose: true
-          flags: server
+          flags: server-postgres
diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml
index 5bf59f087e..877ad67f6c 100644
--- a/.github/workflows/ui-tests.yml
+++ b/.github/workflows/ui-tests.yml
@@ -21,7 +21,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-       containers: [1, 2, 3]
+       # Make sure you modify coverage submission file list if changing this
+       container: [1, 2, 3]
 
     name: UI Tests (Cypress)
 
@@ -160,26 +161,50 @@ jobs:
         with:
           files: "/home/runner/frappe-bench/apps/frappe/.cypress-coverage/clover.xml"
 
-      - name: Upload Coverage Data
+      - name: Upload JS coverage data
         if: ${{ steps.check-build.outputs.build == 'strawberry' && steps.check_coverage.outputs.files_exists == 'true' }}
-        uses: codecov/codecov-action@v3
+        uses: actions/upload-artifact@v3
         with:
-          name: Cypress
-          fail_ci_if_error: true
-          directory: /home/runner/frappe-bench/apps/frappe/.cypress-coverage/
-          verbose: true
-          flags: ui-tests
+          name: coverage-js-${{ matrix.container }}
+          path: /home/runner/frappe-bench/apps/frappe/.cypress-coverage/clover.xml
 
-      - name: Upload Server Coverage Data
-        if: ${{ steps.check-build.outputs.build-server == 'strawberry' }}
-        uses: codecov/codecov-action@v3
+      - name: Upload python coverage data
+        if: ${{ steps.check-build.outputs.build == 'strawberry' }}
+        uses: actions/upload-artifact@v3
         with:
-          name: MariaDB
-          fail_ci_if_error: true
-          files: /home/runner/frappe-bench/sites/coverage.xml
-          verbose: true
-          flags: server
+          name: coverage-py-${{ matrix.container }}
+          path: /home/runner/frappe-bench/sites/coverage.xml
 
       - name: Show bench console if tests failed
         if: ${{ failure() }}
         run: cat ~/frappe-bench/bench_start.log
+
+
+  coverage:
+    name: Coverage Wrap Up
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clone
+        uses: actions/checkout@v2
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v3
+
+      - name: Upload python coverage data
+        uses: codecov/codecov-action@v3
+        with:
+          name: MariaDB
+          fail_ci_if_error: true
+          verbose: true
+          files: ./coverage-py-1/coverage.xml,./coverage-py-2/coverage.xml,./coverage-py-3/coverage.xml
+          flags: server-ui
+
+      - name: Upload JS coverage data
+        uses: codecov/codecov-action@v3
+        with:
+          name: Cypress
+          fail_ci_if_error: true
+          files: ./coverage-js-1/clover.xml,./coverage-js-2/clover.xml,./coverage-js-3/clover.xml
+          verbose: true
+          flags: ui-tests
diff --git a/codecov.yml b/codecov.yml
index 1326403cfe..bd3aa72c57 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -25,11 +25,19 @@ comment:
   require_changes: true
 
 flags:
-  server:
+  server-mariadb:
     paths:
-      - ".*\\.py"
+      - "**/*.py"
+    carryforward: true
+  server-postgres:
+    paths:
+      - "**/*.py"
     carryforward: true
   ui-tests:
     paths:
-      - ".*\\.js"
+      - "**/*.js"
+    carryforward: true
+  server-ui:
+    paths:
+      - "**/*.py"
     carryforward: true