diff --git a/Makefile b/Makefile index 0b5e885b..51fb1784 100644 --- a/Makefile +++ b/Makefile @@ -14,13 +14,7 @@ else DOCKER_VERSION = $(DOCKER_VERSION_ACTUAL) endif -#Get the docker-compose version (must use the same version for acceptance tests) -DOCKER_COMPOSE_VERSION_ACTUAL = $(shell docker-compose version --short) -ifeq ($(DOCKER_COMPOSE_VERSION_ACTUAL),) -DOCKER_COMPOSE_VERSION = 1.8.0 -else -DOCKER_COMPOSE_VERSION = $(DOCKER_COMPOSE_VERSION_ACTUAL) -endif +DOCKER_COMPOSE_VERSION = 1.29.2 all: acceptance @@ -34,9 +28,9 @@ build: .PHONY: acceptance acceptance: build - (cd acceptance_tests/ && docker-compose up -d) - (cd acceptance_tests/ && docker-compose exec -T acceptance bash -c 'cd /acceptance_tests ; py.test -vv --color=yes --junitxml /tmp/junitxml/results.xml') - (cd acceptance_tests/ && docker-compose down) + (cd acceptance_tests/ && docker compose up -d) + (cd acceptance_tests/ && docker compose exec -T acceptance bash -c 'cd /acceptance_tests ; py.test -vv --color=yes --junitxml /tmp/junitxml/results.xml') + (cd acceptance_tests/ && docker compose down) .PHONY: clean clean: diff --git a/ci/config.yaml b/ci/config.yaml index 338d18e7..86fc1576 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 96aaef99..78dafb78 100644 --- a/ci/requirements.txt +++ b/ci/requirements.txt @@ -1,4 +1,4 @@ -c2cciutils[publish]==1.6.21 +c2cciutils[publish]==1.6.22 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 certifi>=2022.12.7 # not directly required, pinned by Snyk to avoid a vulnerability