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.

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

Update CI dependencies to v1.6.22 (1.19) (patch) #2473

Merged
merged 2 commits into from
Aug 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 9 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,37 +23,37 @@ prospector: ## Run Prospector

PHONY: tests
tests: build ## Run the unit tests
docker-compose stop --timeout=0
docker-compose down || true
docker compose stop --timeout=0
docker compose down || true
C2C_AUTH_GITHUB_CLIENT_ID=$(shell gopass show gs/projects/github/oauth-apps/geoservices-int/client-id) \
C2C_AUTH_GITHUB_CLIENT_SECRET=$(shell gopass show gs/projects/github/oauth-apps/geoservices-int/client-secret) \
docker-compose up -d
docker compose up -d

# Wait for DB to be up
while ! docker-compose exec -T test psql -h db -p 5432 -U postgres -v ON_ERROR_STOP=1 -c "SELECT 1" -d tests; \
while ! docker compose exec -T test psql -h db -p 5432 -U postgres -v ON_ERROR_STOP=1 -c "SELECT 1" -d tests; \
do \
echo "Waiting for DB to be UP"; \
sleep 1; \
done

c2cciutils-docker-logs

docker-compose exec -T test pytest -vv --color=yes
docker compose exec -T test pytest -vv --color=yes

c2cciutils-docker-logs
docker-compose down
docker compose down

PHONY: tests-fast
tests-fast:
C2C_AUTH_GITHUB_CLIENT_ID=$(shell gopass show gs/projects/github/oauth-apps/geoservices-int/client-id) \
C2C_AUTH_GITHUB_CLIENT_SECRET=$(shell gopass show gs/projects/github/oauth-apps/geoservices-int/client-secret) \
docker-compose up -d
docker compose up -d

# Wait for DB to be up
while ! docker-compose exec -T test psql -h db -p 5432 -U postgres -v ON_ERROR_STOP=1 -c "SELECT 1" -d tests; \
while ! docker compose exec -T test psql -h db -p 5432 -U postgres -v ON_ERROR_STOP=1 -c "SELECT 1" -d tests; \
do \
echo "Waiting for DB to be UP"; \
sleep 1; \
done

docker-compose exec -T test pytest -vv --color=yes --exitfirst #--last-failed
docker compose exec -T test pytest -vv --color=yes --exitfirst #--last-failed
2 changes: 1 addition & 1 deletion ci/config.yaml
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.21/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
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
c2cciutils[checks,publish]==1.6.21
c2cciutils[checks,publish]==1.6.22
poetry-dynamic-versioning==1.1.1
poetry-plugin-export==1.5.0
poetry-plugin-tweak-dependencies-version==1.5.2
Expand Down
Loading