From 00b6a6729ddc0020b4a6d208609cd0e2ba640bb8 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 7 May 2021 21:59:58 +0530
Subject: [PATCH] ci: Use right parallel test runner command

- Also, fix coverage & coveralls setup
---
 .github/workflows/server-mariadb-tests.yml  | 38 ++++++---------------
 .github/workflows/server-postgres-tests.yml |  2 +-
 requirements.txt                            |  2 +-
 3 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/server-mariadb-tests.yml b/.github/workflows/server-mariadb-tests.yml
index 92d58ee678..97eafcc882 100644
--- a/.github/workflows/server-mariadb-tests.yml
+++ b/.github/workflows/server-mariadb-tests.yml
@@ -89,36 +89,17 @@ jobs:
           DB: mariadb
           TYPE: server
 
-      - name: Setup tmate session
-        if: contains(github.event.pull_request.labels.*.name, 'debug-gha')
-        uses: mxschmitt/action-tmate@v3
 
       - name: Run Tests
-        run: cd ~/frappe-bench/ && bench --site test_site run-parallel-tests --with-coverage --ci-build-id $GITHUB_RUN_ID
+        run: cd ~/frappe-bench/ && bench --site test_site run-parallel-tests --build-number ${{ matrix.container }} --total-builds 2 --with-coverage
 
       - name: Upload Coverage Data
-        if: github.event_name == 'pull_request'
         run: |
           cp ~/frappe-bench/sites/.coverage ${GITHUB_WORKSPACE}
           cd ${GITHUB_WORKSPACE}
-          pip install coveralls==2.2.0
-          pip install coverage==4.5.4
-          coveralls debug --service=github
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
-          COVERALLS_FLAG_NAME: run-${{ matrix.test_number }}
-          COVERALLS_SERVICE_NAME: github
-          COVERALLS_PARALLEL: true
-
-      - name: Upload Coverage Data
-        if: github.event_name == 'push'
-        run: |
-          cp ~/frappe-bench/sites/.coverage ${GITHUB_WORKSPACE}
-          cd ${GITHUB_WORKSPACE}
-          pip install coveralls==2.2.0
-          pip install coverage==4.5.4
-          coveralls debug --service=github-actions
+          pip3 install coverage==5.5
+          pip3 install coveralls==3.0.1
+          coveralls --service=github-actions
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
@@ -129,14 +110,17 @@ jobs:
   coveralls:
     name: Coverage Wrap Up
     needs: test
+    container: python:3-slim
     runs-on: ubuntu-18.04
     steps:
+      - name: Clone
+        uses: actions/checkout@v2
+
       - name: Coveralls Finished
         run: |
           cd ${GITHUB_WORKSPACE}
-          pip install coveralls==3.0.1
-          pip install coverage==4.5.4
-          coveralls debug --finish
+          pip3 install coverage==5.5
+          pip3 install coveralls==3.0.1
+          coveralls --finish
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
diff --git a/.github/workflows/server-postgres-tests.yml b/.github/workflows/server-postgres-tests.yml
index d7697081a2..bef4cbadce 100644
--- a/.github/workflows/server-postgres-tests.yml
+++ b/.github/workflows/server-postgres-tests.yml
@@ -94,4 +94,4 @@ jobs:
           TYPE: server
 
       - name: Run Tests
-        run: cd ~/frappe-bench/ && bench --site test_site run-parallel-tests --ci-build-id $GITHUB_RUN_ID
+        run: cd ~/frappe-bench/ && bench --site test_site run-parallel-tests --build-number ${{ matrix.container }} --total-builds 3
diff --git a/requirements.txt b/requirements.txt
index 98ceaeb202..769d8c3e7b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ braintree~=4.8.0
 chardet~=4.0.0
 Click~=7.1.2
 colorama~=0.4.4
-coverage~=4.5.4
+coverage==5.5
 croniter~=1.0.11
 cryptography~=3.4.7
 dropbox~=11.7.0