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 to v1.6.22 (3.4) (patch) #1130

Merged
merged 3 commits into from
Aug 7, 2024
Merged

Update CI dependencies to v1.6.22 (3.4) (patch) #1130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
11674ca
Update CI dependencies to v1.6.22
renovate[bot] Aug 7, 2024
045eada
Use Docker Compose version 2
sbrunner Aug 7, 2024
806ccaa
Fix acceptances tests
sbrunner Aug 7, 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
14 changes: 7 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,22 +47,22 @@ build-acceptance:
acceptance: build-acceptance build # Run the acceptance tests
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 --detach
docker-compose exec -T tests pytest -vv --color=yes --junitxml /reports/acceptance.xml acceptance
docker-compose down
docker compose up --detach
docker compose exec -T tests pytest -vv --color=yes --junitxml /reports/acceptance.xml acceptance
docker compose down

.PHONY: run
run: build
docker-compose stop
docker-compose rm --force
docker compose stop
docker compose rm --force
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 --detach
docker compose up --detach

.PHONY: clean
clean:
rm -rf reports .venv
docker-compose down
docker compose down

.PHONY: checks
checks: prospector acceptance-prospector ## Run the checks
Expand Down
4 changes: 2 additions & 2 deletions app/shared_config_manager/templates/source.html.mako
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@
<b>${key_format(key) | h}</b>: ${', '.join(value) | h}<br />
%elif isinstance(value, dict):
<b>${key_format(key) | h}</b>:<br />
%for k, v in value.items():
&nbsp;&nbsp;&nbsp;&nbsp;${k | h} = ${v | h}<br />
%for k in sorted(value.keys()):
&nbsp;&nbsp;&nbsp;&nbsp;${k | h} = ${value[k] | h}<br />
%endfor
%else:
<b>${key_format(key) | h}</b>: ${value | h}<br />
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.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:
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[checks,publish]==1.6.21
c2cciutils[checks,publish]==1.6.22
pre-commit==3.4.0
certifi>=2024.7.4 # not directly required, pinned by Snyk to avoid a vulnerability
setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability
Expand Down
Loading