From 92e9e07f34c297f5b61350aee086d0143882c6fa Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sun, 17 May 2020 20:18:14 +0200
Subject: [PATCH] Move codacy into main action

---
 .github/workflows/codacy-coverage-reporter.yml | 17 -----------------
 .github/workflows/pythonpackage.yml            | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 17 deletions(-)
 delete mode 100644 .github/workflows/codacy-coverage-reporter.yml

diff --git a/.github/workflows/codacy-coverage-reporter.yml b/.github/workflows/codacy-coverage-reporter.yml
deleted file mode 100644
index 21bb9b7a9a..0000000000
--- a/.github/workflows/codacy-coverage-reporter.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-# This sends coverage reports to codacy
-#
-name: codacy-coverage-reporter
-
-on: ["push"]
-
-jobs:
-  codacy-coverage-reporter:
-    runs-on: ubuntu-latest
-    name: codacy-coverage-reporter
-    steps:
-      - uses: actions/checkout@master
-      - name: Run codacy-coverage-reporter
-        uses: codacy/codacy-coverage-reporter-action@master
-        with:
-          project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
-          coverage-reports: coverage.xml
diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml
index e18f9e649e..c316cf6ff5 100644
--- a/.github/workflows/pythonpackage.yml
+++ b/.github/workflows/pythonpackage.yml
@@ -89,5 +89,21 @@ jobs:
 
     - name: run test 
       run: |
+        echo `pwd`
+        echo `ls`
         cd testing_mygame 
         coverage run --source=../evennia --omit=*/migrations/*,*/urls.py,*/test*.py,*.sh,*.txt,*.md,*.pyc,*.service ../bin/unix/evennia test --settings=settings --keepdb evennia
+
+    # we only want to run coverall once, so we only do it for one of the matrix combinations
+    - name: run coverall
+      if: ${{ matrix.TESTING_DB == 'sqlite3' && matrix.python-version == 3.7 }}
+      run: |
+        coveralls
+        coverage xml
+        python-codacy-coverage -r coverage.xml
+
+    - name: codacy-coverage-reporter
+      uses: codacy/codacy-coverage-reporter-action@master
+      with:
+          project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
+          coverage-reports: coverage.xml