From ea3133be1d4da530941231e8aed5ba25e5a69ccb Mon Sep 17 00:00:00 2001 From: Oliver Date: Wed, 18 May 2022 15:11:37 +1000 Subject: [PATCH 1/3] 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 From 3e05c5fde1a2fe52e5aa82d64a7477c4d392d5f6 Mon Sep 17 00:00:00 2001 From: Oliver Date: Wed, 18 May 2022 15:12:19 +1000 Subject: [PATCH 2/3] Bring docker containers down --- .github/workflows/docker_latest.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/docker_latest.yaml b/.github/workflows/docker_latest.yaml index 9942407c07..9324c39b54 100644 --- a/.github/workflows/docker_latest.yaml +++ b/.github/workflows/docker_latest.yaml @@ -32,6 +32,10 @@ jobs: run: | cd docker docker-compose run inventree-dev-server invoke test + - name: Down again + run: | + cd docker + docker-compose down - name: Set up QEMU uses: docker/setup-qemu-action@v1 - name: Set up Docker Buildx From 2fde482eab5463803773625e1c06ed1034f6cc16 Mon Sep 17 00:00:00 2001 From: Oliver Date: Wed, 18 May 2022 15:39:58 +1000 Subject: [PATCH 3/3] Simplify steps --- .github/workflows/docker_latest.yaml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docker_latest.yaml b/.github/workflows/docker_latest.yaml index 9324c39b54..74b5eb966c 100644 --- a/.github/workflows/docker_latest.yaml +++ b/.github/workflows/docker_latest.yaml @@ -23,18 +23,12 @@ jobs: 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 up -d + docker-compose run inventree-dev-server invoke wait docker-compose run inventree-dev-server invoke test - - name: Down again - run: | - cd docker docker-compose down - name: Set up QEMU uses: docker/setup-qemu-action@v1