From cf52e963a446826139ac077356cd3623c912a1cb Mon Sep 17 00:00:00 2001 From: "serious-scaffold[bot]" <160990600+serious-scaffold[bot]@users.noreply.github.com> Date: Thu, 30 Jan 2025 01:36:54 +0000 Subject: [PATCH 1/2] build(deps): update dependency check-jsonschema to v0.31.0 --- Makefile | 2 +- template/Makefile.jinja | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b454ba00..8ec4720d 100644 --- a/Makefile +++ b/Makefile @@ -61,7 +61,7 @@ lock: # Install standalone tools prerequisites: - pipx install --force check-jsonschema==0.30.0 + pipx install --force check-jsonschema==0.31.0 pipx install --force codespell[toml]==2.4.1 pipx install --force pdm==2.22.3 pipx install --force pre-commit==4.0.1 diff --git a/template/Makefile.jinja b/template/Makefile.jinja index 2b3b4560..51f2a1f0 100644 --- a/template/Makefile.jinja +++ b/template/Makefile.jinja @@ -65,7 +65,7 @@ lock: # Install standalone tools prerequisites: - pipx install --force check-jsonschema==0.30.0 + pipx install --force check-jsonschema==0.31.0 pipx install --force codespell[toml]==2.4.1 pipx install --force pdm==2.22.3 pipx install --force pre-commit==4.0.1 From 527cac2b9f4f345a84ec282d7e5577343c292f5a Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Thu, 30 Jan 2025 02:34:14 +0000 Subject: [PATCH 2/2] fix --- .gitlab/workflows/ci.yml | 2 +- Makefile | 2 +- template/Makefile.jinja | 2 +- .../workflows/ci.yml.jinja | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab/workflows/ci.yml b/.gitlab/workflows/ci.yml index c38b472e..9a014439 100644 --- a/.gitlab/workflows/ci.yml +++ b/.gitlab/workflows/ci.yml @@ -12,7 +12,7 @@ ci: - pdm.dev.lock - pdm.lock prefix: venv-${PYTHON_VERSION} - coverage: /TOTAL.*? (100(?:\.0+)?\%\|[1-9]?\d(?:\.\d+)?\%)$/ + coverage: /TOTAL.*? (100(?:\.0+)?\%|[1-9]?\d(?:\.\d+)?\%)$/ image: ${CI_REGISTRY_IMAGE}/dev:py${PYTHON_VERSION} interruptible: true parallel: diff --git a/Makefile b/Makefile index 8ec4720d..822f6ab2 100644 --- a/Makefile +++ b/Makefile @@ -96,7 +96,7 @@ codespell: # Check jsonschema with check-jsonschema. check-jsonschema: check-jsonschema --builtin-schema vendor.github-workflows .github/workflows/*.yml - check-jsonschema --builtin-schema vendor.gitlab-ci --data-transform gitlab-ci .gitlab-ci.yml .gitlab/workflows/*.yml + check-jsonschema --builtin-schema vendor.gitlab-ci --data-transform gitlab-ci --regex-variant nonunicode .gitlab-ci.yml .gitlab/workflows/*.yml check-jsonschema --builtin-schema vendor.readthedocs .readthedocs.yaml check-jsonschema --builtin-schema vendor.renovate .renovaterc.json diff --git a/template/Makefile.jinja b/template/Makefile.jinja index 51f2a1f0..bea40c17 100644 --- a/template/Makefile.jinja +++ b/template/Makefile.jinja @@ -103,7 +103,7 @@ check-jsonschema: check-jsonschema --builtin-schema vendor.github-workflows .github/workflows/*.yml [% endif %] [% if repo_platform == 'gitlab' or repo_platform == 'gitlab-self-managed' or project_name == "Serious Scaffold Python" %] - check-jsonschema --builtin-schema vendor.gitlab-ci --data-transform gitlab-ci .gitlab-ci.yml .gitlab/workflows/*.yml + check-jsonschema --builtin-schema vendor.gitlab-ci --data-transform gitlab-ci --regex-variant nonunicode .gitlab-ci.yml .gitlab/workflows/*.yml [% endif %] check-jsonschema --builtin-schema vendor.readthedocs .readthedocs.yaml check-jsonschema --builtin-schema vendor.renovate .renovaterc.json diff --git a/template/[% if repo_platform == 'gitlab' or repo_platform == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/ci.yml.jinja b/template/[% if repo_platform == 'gitlab' or repo_platform == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/ci.yml.jinja index 58e14fcf..3a5b5c05 100644 --- a/template/[% if repo_platform == 'gitlab' or repo_platform == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/ci.yml.jinja +++ b/template/[% if repo_platform == 'gitlab' or repo_platform == 'gitlab-self-managed' %].gitlab[% endif %]/workflows/ci.yml.jinja @@ -13,7 +13,7 @@ ci: - pdm.dev.lock - pdm.lock prefix: venv-${PYTHON_VERSION} - coverage: /TOTAL.*? (100(?:\.0+)?\%\|[1-9]?\d(?:\.\d+)?\%)$/ + coverage: /TOTAL.*? (100(?:\.0+)?\%|[1-9]?\d(?:\.\d+)?\%)$/ image: ${CI_REGISTRY_IMAGE}/dev:py${PYTHON_VERSION} interruptible: true parallel: