From ea3133be1d4da530941231e8aed5ba25e5a69ccb Mon Sep 17 00:00:00 2001
From: Oliver <oliver.henry.walters@gmail.com>
Date: Wed, 18 May 2022 15:11:37 +1000
Subject: [PATCH] Combine docker-build and docker-test CI steps

- We are building anyway, may as well test
---
 .github/workflows/docker_latest.yaml | 14 ++++++++++
 .github/workflows/docker_test.yaml   | 38 ----------------------------
 2 files changed, 14 insertions(+), 38 deletions(-)
 delete mode 100644 .github/workflows/docker_test.yaml

diff --git a/.github/workflows/docker_latest.yaml b/.github/workflows/docker_latest.yaml
index 6b248fe0b9..9942407c07 100644
--- a/.github/workflows/docker_latest.yaml
+++ b/.github/workflows/docker_latest.yaml
@@ -18,6 +18,20 @@ 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
+          docker-compose up -d
+      - name: Wait for Server
+        run: |
+          cd docker
+          docker-compose run inventree-dev-server invoke wait
+      - name: Run unit tests
+        run: |
+          cd docker
+          docker-compose run inventree-dev-server invoke test
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx
diff --git a/.github/workflows/docker_test.yaml b/.github/workflows/docker_test.yaml
deleted file mode 100644
index b4bb37715d..0000000000
--- a/.github/workflows/docker_test.yaml
+++ /dev/null
@@ -1,38 +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. Launch the development server, and update the installation
-# 3. Run unit tests within the docker context
-
-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 build
-          docker-compose run inventree-dev-server invoke update
-          docker-compose up -d
-      - name: Wait for Server
-        run: |
-          cd docker
-          docker-compose run inventree-dev-server invoke wait
-      - name: Run unit tests
-        run: |
-          cd docker
-          docker-compose run inventree-dev-server invoke test