From df9aa01090f3bcbcc17276b77bf835ebafe0fac1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 8 Aug 2024 08:37:34 +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 4a10eae1..d327c3f4 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 checks: required_workflows: diff --git a/ci/requirements.txt b/ci/requirements.txt index c67750b3..671c180d 100644 --- a/ci/requirements.txt +++ b/ci/requirements.txt @@ -1,4 +1,4 @@ -c2cciutils[publish]==1.6.21 +c2cciutils[publish]==1.6.22 tomlkit oauthlib>=3.2.1 # not directly required, pinned by Snyk to avoid a vulnerability setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability From 7da9ee80b0a171c9ee275c2e7b3a52ace8eee4f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Thu, 8 Aug 2024 11:57:44 +0200 Subject: [PATCH 2/2] Use Docker Compose version 2 --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 04ecd6e6..9f62f1ce 100644 --- a/Makefile +++ b/Makefile @@ -28,12 +28,12 @@ build-no-cache: ## Build the Docker image (no cache) .PHONY: acceptance acceptance: build ## Run the acceptance tests - (cd acceptance_tests/ && docker-compose down) - (cd acceptance_tests/ && docker-compose build) - (cd acceptance_tests/ && docker-compose up -d) - (cd acceptance_tests/ && docker-compose exec -T acceptance py.test -vv --color=yes --junitxml /tmp/junitxml/results.xml) - (cd acceptance_tests/ && docker-compose down) + (cd acceptance_tests/ && docker compose down) + (cd acceptance_tests/ && docker compose build) + (cd acceptance_tests/ && docker compose up -d) + (cd acceptance_tests/ && docker compose exec -T acceptance py.test -vv --color=yes --junitxml /tmp/junitxml/results.xml) + (cd acceptance_tests/ && docker compose down) .PHONY: run run: build - (cd acceptance_tests; docker-compose up) + (cd acceptance_tests; docker compose up -d)