Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update CI dependencies (master) (patch) #432

Merged
merged 2 commits into from
Aug 6, 2024
Merged

Update CI dependencies (master) (patch) #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b73121
Update CI dependencies
renovate[bot] Aug 5, 2024
933a2e7
Use Docker Compose version 2
sbrunner Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ repos:
hooks:
- id: prettier
additional_dependencies:
- [email protected].0 # npm
- [email protected].3 # npm
- [email protected] # npm
- [email protected] # npm
- '@prettier/[email protected]' # npm
Expand Down
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading