From 27d2ea44284b90488618927612dc3a1e66151cce Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 8 Aug 2024 08:37:50 +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 53cca946..51eefa52 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 version: branch_to_version_re: diff --git a/ci/requirements.txt b/ci/requirements.txt index bc2ae2fd..c943f5a1 100644 --- a/ci/requirements.txt +++ b/ci/requirements.txt @@ -1,2 +1,2 @@ -c2cciutils[checks,publish]==1.6.21 +c2cciutils[checks,publish]==1.6.22 pre-commit==3.8.0 From ec7facdc74facd95f4ef70be5afefd8b24ff7918 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 --- .github/workflows/rebuild.yaml | 2 +- Makefile | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/rebuild.yaml b/.github/workflows/rebuild.yaml index db86be26..53a752a5 100644 --- a/.github/workflows/rebuild.yaml +++ b/.github/workflows/rebuild.yaml @@ -43,7 +43,7 @@ jobs: - run: make build - run: make acceptance - - run: (cd acceptance_tests && (c2cciutils-docker-logs || docker-compose logs)) + - run: (cd acceptance_tests && (c2cciutils-docker-logs || docker compose logs)) if: always() - name: Set up QEMU diff --git a/Makefile b/Makefile index 104d5801..237f31af 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 -d) + (cd acceptance_tests; docker compose up -d)