From bb22f7565bf8069e16836a2d4ea0d2945803a099 Mon Sep 17 00:00:00 2001
From: Matthias <matthias.mair@oewf.org>
Date: Thu, 2 Dec 2021 13:25:01 +0100
Subject: [PATCH] merge in sqlite / coverage

---
 .github/workflows/coverage.yaml  | 59 --------------------------------
 .github/workflows/pr_checks.yaml | 42 +++++++++++++++++++++++
 2 files changed, 42 insertions(+), 59 deletions(-)
 delete mode 100644 .github/workflows/coverage.yaml

diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml
deleted file mode 100644
index 6b14f7b8b2..0000000000
--- a/.github/workflows/coverage.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-# Perform CI checks, and calculate code coverage
-
-name: SQLite
-
-on:
-  workflow_run:
-    workflows: ['PR checks']
-    types:
-      - completed
-
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  INVENTREE_DB_NAME: './test_db.sqlite'
-  INVENTREE_DB_ENGINE: django.db.backends.sqlite3
-  INVENTREE_DEBUG: info
-  INVENTREE_MEDIA_ROOT: ./media
-  INVENTREE_STATIC_ROOT: ./static
-
-
-jobs:
-
-  # Run tests on SQLite database
-  # These tests are used for code coverage analysis
-  coverage:
-    runs-on: ubuntu-latest
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
-
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v2
-      - name: Setup Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.7
-      - name: Install Dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install gettext
-          pip3 install invoke
-          invoke install
-          invoke static
-      - name: Coverage Tests
-        run: |
-          invoke coverage
-      - name: Data Import Export
-        run: |
-          invoke migrate
-          invoke import-fixtures
-          invoke export-records -f data.json
-          rm test_db.sqlite
-          invoke migrate
-          invoke import-records -f data.json
-          invoke import-records -f data.json
-      - name: Test Translations 
-        run: invoke translate
-      - name: Check Migration Files
-        run: python3 ci/check_migration_files.py
-      - name: Upload Coverage Report
-        run: coveralls
diff --git a/.github/workflows/pr_checks.yaml b/.github/workflows/pr_checks.yaml
index be47376fdc..65193a47fe 100644
--- a/.github/workflows/pr_checks.yaml
+++ b/.github/workflows/pr_checks.yaml
@@ -155,3 +155,45 @@ jobs:
         run: |
           cd ${{ env.wrapper_name }}
           invoke test
+
+  coverage:
+    name: Sqlite / coverage
+    needs: ['javascript', 'html']
+    runs-on: ubuntu-latest
+
+    env:
+      INVENTREE_DB_NAME: './test_db.sqlite'
+      INVENTREE_DB_ENGINE: django.db.backends.sqlite3
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v2
+      - name: Setup Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+      - name: Install Dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install gettext
+          pip3 install invoke
+          invoke install
+          invoke static
+      - name: Coverage Tests
+        run: |
+          invoke coverage
+      - name: Data Import Export
+        run: |
+          invoke migrate
+          invoke import-fixtures
+          invoke export-records -f data.json
+          rm test_db.sqlite
+          invoke migrate
+          invoke import-records -f data.json
+          invoke import-records -f data.json
+      - name: Test Translations 
+        run: invoke translate
+      - name: Check Migration Files
+        run: python3 ci/check_migration_files.py
+      - name: Upload Coverage Report
+        run: coveralls