Combine docker-build and docker-test CI steps

- We are building anyway, may as well test
This commit is contained in:
Oliver 2022-05-18 15:11:37 +10:00
parent fd2ec03fab
commit ea3133be1d
2 changed files with 14 additions and 38 deletions

View File

@ -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

View File

@ -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