From 61bf78c97d70d0afef776c0471f24a9faf254b3b Mon Sep 17 00:00:00 2001 From: why-not-try-calmer Date: Tue, 4 Apr 2023 12:42:46 +0200 Subject: [PATCH] Cleaned up --- .github/workflows/test-conformance.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test-conformance.yml b/.github/workflows/test-conformance.yml index 6ead626e..acb6f402 100644 --- a/.github/workflows/test-conformance.yml +++ b/.github/workflows/test-conformance.yml @@ -43,18 +43,15 @@ jobs: cp .env.example .env # start the stack - docker compose \ - -f docker-compose.yml \ - -f docker-compose.override.yml \ - -f docker-compose.tests.yml \ - up postgres django conformance_suite --build -d + COMPOSE_FILE=docker-compose.yml:docker-compose.override.yml:docker-compose.tests.yml + docker compose up postgres django conformance_suite --build -d # deploy static files and migrate database - docker compose run django python manage.py collectstatic --no-input - docker compose run django python manage.py migrate --no-input + docker compose exec django python manage.py collectstatic --no-input + docker compose exec django python manage.py migrate --no-input # sprinkle some test data (refreshing computed fields is done from the command handler) - docker compose run django python manage.py init --data + docker compose exec django python manage.py init --data # run conformance test docker compose run test_client