From 0b731216e08725ffe356f6bd6ea50180a9b0a92a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 17:21:51 +0000 Subject: [PATCH 1/2] Update CI dependencies --- .pre-commit-config.yaml | 2 +- ci/config.yaml | 2 +- ci/requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index aa0598a3..2474bd28 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -53,7 +53,7 @@ repos: hooks: - id: prettier additional_dependencies: - - prettier@3.3.0 # npm + - prettier@3.3.3 # npm - prettier-plugin-sh@0.14.0 # npm - prettier-plugin-toml@2.0.1 # npm - '@prettier/plugin-xml@0.12.0' # npm diff --git a/ci/config.yaml b/ci/config.yaml index 06bcef1f..5654847d 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.19/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 b5c1ab7b..25a77ddb 100644 --- a/ci/requirements.txt +++ b/ci/requirements.txt @@ -1,4 +1,4 @@ -c2cciutils[publish]==1.6.19 +c2cciutils[publish]==1.6.22 poetry-dynamic-versioning==1.3.0 poetry-plugin-export==1.8.0 poetry-plugin-tweak-dependencies-version==1.5.2 From 933a2e7efd4685b6d1f5c626b2e4519dae1c4530 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Tue, 6 Aug 2024 10:21:30 +0200 Subject: [PATCH 2/2] Use Docker Compose version 2 --- .github/workflows/main.yaml | 2 +- Makefile | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 0a8171a0..db3dc159 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -60,7 +60,7 @@ jobs: - name: Docker compose logs run: | c2cciutils-docker-logs - docker-compose down -v --remove-orphans + docker compose down -v --remove-orphans if: always() - uses: camptocamp/initialise-gopass-summon-action@v2 with: diff --git a/Makefile b/Makefile index 80f057c0..4b132b11 100644 --- a/Makefile +++ b/Makefile @@ -52,12 +52,12 @@ test: test_c2cgeoform test_c2cgeoform_demo .PHONY: test_c2cgeoform test_c2cgeoform: build poetry - docker-compose up -d db + docker compose up -d db poetry run pytest -vvv .PHONY: test_c2cgeoform_demo test_c2cgeoform_demo: $(BUILD_DIR)/c2cgeoform_demo - docker-compose up -d db + docker compose up -d db make -C $(BUILD_DIR)/c2cgeoform_demo -f ./dev.mk test $(BUILD_DIR)/c2cgeoform_demo: build c2cgeoform/scaffolds/c2cgeoform c2cgeoform_demo_dev.mk @@ -101,7 +101,7 @@ cleanall: clean .PHONY: initdb initdb: $(BUILD_DIR)/c2cgeoform_demo - docker-compose up -d db + docker compose up -d db sleep 1 make -C $(BUILD_DIR)/c2cgeoform_demo -f dev.mk initdb @@ -111,7 +111,7 @@ webpack-dev: .PHONY: serve serve: build $(BUILD_DIR)/c2cgeoform_demo - docker-compose up -d db + docker compose up -d db make -C $(BUILD_DIR)/c2cgeoform_demo -f dev.mk serve .PHONY: modwsgi