Merge branch 'inventree:master' into not-working-tests

.github/workflows/docker_latest.yaml

@@ -18,6 +18,18 @@ jobs:
       - name: Check version number
         run: |
           python3 ci/check_version_number.py --dev
+      - name: Build Docker Image
+        run: |
+          cd docker
+          docker-compose build
+          docker-compose run inventree-dev-server invoke update
+      - name: Run unit tests
+        run: |
+          cd docker
+          docker-compose up -d
+          docker-compose run inventree-dev-server invoke wait
+          docker-compose run inventree-dev-server invoke test
+          docker-compose down
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx

.github/workflows/docker_test.yaml

@@ -1,37 +0,0 @@
-# Test that the InvenTree docker image compiles correctly
-
-# This CI action runs on pushes to either the master or stable branches
-
-# 1. Build the development docker image (as per the documentation)
-# 2. Install requied python libs into the docker container
-# 3. Launch the container
-# 4. Check that the API endpoint is available
-
-name: Docker Test
-
-on:
-  push:
-    branches:
-      - 'master'
-      - 'stable'
-
-jobs:
-
-  docker:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v2
-      - name: Build Docker Image
-        run: |
-          cd docker
-          docker-compose -f docker-compose.sqlite.yml build
-          docker-compose -f docker-compose.sqlite.yml run inventree-dev-server invoke update
-          docker-compose -f docker-compose.sqlite.yml up -d
-      - name: Sleepy Time
-        run: sleep 60
-      - name: Test API
-        run: |
-          pip install requests
-          python3 ci/check_api_endpoint.py

.github/workflows/qc_checks.yaml

@@ -153,6 +153,7 @@ jobs:
           invoke delete-data -f
           invoke import-fixtures
           invoke server -a 127.0.0.1:12345 &
+          invoke wait
       - name: Run Tests
         run: |
           cd ${{ env.wrapper_name }}