From e8299515d55379fe6d2e991b9369e142bdefb98a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 6 Aug 2024 08:08:38 +0000 Subject: [PATCH 1/2] Update CI dependencies to v1.6.22 --- ci/config.yaml | 2 +- ci/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/config.yaml b/ci/config.yaml index 739d17259..2384de646 100644 --- a/ci/config.yaml +++ b/ci/config.yaml @@ -1,4 +1,4 @@ -# yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/c2cciutils/1.6.21/c2cciutils/schema.json +# yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/c2cciutils/1.6.22/c2cciutils/schema.json publish: docker: diff --git a/ci/requirements.txt b/ci/requirements.txt index a8440e556..ee1978689 100644 --- a/ci/requirements.txt +++ b/ci/requirements.txt @@ -1,4 +1,4 @@ -c2cciutils[checks,publish]==1.6.21 +c2cciutils[checks,publish]==1.6.22 poetry-dynamic-versioning==1.1.1 poetry-plugin-export==1.5.0 poetry-plugin-tweak-dependencies-version==1.5.2 From 099f27a3b3f5a3d9a007a6b947976307ebd5c915 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Tue, 6 Aug 2024 17:02:07 +0200 Subject: [PATCH 2/2] Use Docker Compose version 2 --- Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 8ca29f355..9c961d76a 100644 --- a/Makefile +++ b/Makefile @@ -23,14 +23,14 @@ prospector: ## Run Prospector PHONY: tests tests: build ## Run the unit tests - docker-compose stop --timeout=0 - docker-compose down || true + docker compose stop --timeout=0 + docker compose down || true C2C_AUTH_GITHUB_CLIENT_ID=$(shell gopass show gs/projects/github/oauth-apps/geoservices-int/client-id) \ C2C_AUTH_GITHUB_CLIENT_SECRET=$(shell gopass show gs/projects/github/oauth-apps/geoservices-int/client-secret) \ - docker-compose up -d + docker compose up -d # Wait for DB to be up - while ! docker-compose exec -T test psql -h db -p 5432 -U postgres -v ON_ERROR_STOP=1 -c "SELECT 1" -d tests; \ + while ! docker compose exec -T test psql -h db -p 5432 -U postgres -v ON_ERROR_STOP=1 -c "SELECT 1" -d tests; \ do \ echo "Waiting for DB to be UP"; \ sleep 1; \ @@ -38,22 +38,22 @@ tests: build ## Run the unit tests c2cciutils-docker-logs - docker-compose exec -T test pytest -vv --color=yes + docker compose exec -T test pytest -vv --color=yes c2cciutils-docker-logs - docker-compose down + docker compose down PHONY: tests-fast tests-fast: C2C_AUTH_GITHUB_CLIENT_ID=$(shell gopass show gs/projects/github/oauth-apps/geoservices-int/client-id) \ C2C_AUTH_GITHUB_CLIENT_SECRET=$(shell gopass show gs/projects/github/oauth-apps/geoservices-int/client-secret) \ - docker-compose up -d + docker compose up -d # Wait for DB to be up - while ! docker-compose exec -T test psql -h db -p 5432 -U postgres -v ON_ERROR_STOP=1 -c "SELECT 1" -d tests; \ + while ! docker compose exec -T test psql -h db -p 5432 -U postgres -v ON_ERROR_STOP=1 -c "SELECT 1" -d tests; \ do \ echo "Waiting for DB to be UP"; \ sleep 1; \ done - docker-compose exec -T test pytest -vv --color=yes --exitfirst #--last-failed + docker compose exec -T test pytest -vv --color=yes --exitfirst #--last-failed