From 7d8e9e0fb017759c5fba78c4892c9077845d6426 Mon Sep 17 00:00:00 2001 From: Hugo Bollon Date: Thu, 5 Sep 2024 11:27:33 +0200 Subject: [PATCH] ci: add concurrency limitation on tests workflow to avoid duplicates --- .github/workflows/tests.yml | 1 + docker-compose.yml | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 12d0f712..fabc0985 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,6 +8,7 @@ on: jobs: tests: name: Execute unit tests + concurrency: ci-${{ github.ref }} strategy: matrix: python-version: [3.12] diff --git a/docker-compose.yml b/docker-compose.yml index 8709633c..7194af2a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,7 +29,7 @@ services: retries: 5 migrate: - image: camptocamp/geoshop-api + image: geoshop-api build: context: . dockerfile: Dockerfile @@ -40,18 +40,18 @@ services: environment: PGHOST: "db" command: > - bash -c " - python3 manage.py migrate && - python3 manage.py collectstatic --noinput && - python3 manage.py compilemessages --locale=fr && - python3 manage.py fixturize" + bash -c " + python3 manage.py migrate && + python3 manage.py collectstatic --noinput && + python3 manage.py compilemessages --locale=fr && + python3 manage.py fixturize" volumes: - "static-files:/app/geoshop_back/static:rw" networks: - geoshop api: - image: camptocamp/geoshop-api + image: geoshop-api depends_on: db: condition: service_healthy