Merge branch 'main' into dependabot/pip/scripts/docker/examples/pytho…

…n/assets/hello_world/setuptools-70.0.0
nhs-england-tools · Oct 22, 2024 · 68379d7 · 68379d7
2 parents 361fa75 + 81e5f86
commit 68379d7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/.tool-versions b/.tool-versions
@@ -2,6 +2,7 @@
 
 terraform 1.7.0
 pre-commit 3.6.0
+vale 3.6.0
 
 # ==============================================================================
 # The section below is reserved for Docker image versions.
@@ -15,7 +16,7 @@ pre-commit 3.6.0
 # docker/ghcr.io/nhs-england-tools/github-runner-image 20230909-321fd1e-rt@sha256:ce4fd6035dc450a50d3cbafb4986d60e77cb49a71ab60a053bb1b9518139a646 # SEE: https://github.com/nhs-england-tools/github-runner-image/pkgs/container/github-runner-image
 # docker/hadolint/hadolint 2.12.0-alpine@sha256:7dba9a9f1a0350f6d021fb2f6f88900998a4fb0aaf8e4330aa8c38544f04db42 # SEE: https://hub.docker.com/r/hadolint/hadolint/tags
 # docker/hashicorp/terraform 1.5.6@sha256:180a7efa983386a27b43657ed610e9deed9e6c3848d54f9ea9b6cb8a5c8c25f5 # SEE: https://hub.docker.com/r/hashicorp/terraform/tags
-# docker/jdkato/vale v2.29.7@sha256:5ccfac574231b006284513ac3e4e9f38833989d83f2a68db149932c09de85149 # SEE: https://hub.docker.com/r/jdkato/vale/tags
+# docker/jdkato/vale v3.6.0@sha256:0ef22c8d537f079633cfff69fc46f69a2196072f69cab1ab232e8a79a388e425 # SEE: https://hub.docker.com/r/jdkato/vale/tags
 # docker/koalaman/shellcheck latest@sha256:e40388688bae0fcffdddb7e4dea49b900c18933b452add0930654b2dea3e7d5c # SEE: https://hub.docker.com/r/koalaman/shellcheck/tags
 # docker/mstruebing/editorconfig-checker 2.7.1@sha256:dd3ca9ea50ef4518efe9be018d669ef9cf937f6bb5cfe2ef84ff2a620b5ddc24 # SEE: https://hub.docker.com/r/mstruebing/editorconfig-checker/tags
 # docker/sonarsource/sonar-scanner-cli 5.0.1@sha256:494ecc3b5b1ee1625bd377b3905c4284e4f0cc155cff397805a244dee1c7d575 # SEE: https://hub.docker.com/r/sonarsource/sonar-scanner-cli/tags
diff --git a/...config/vale/styles/Vocab/words/accept.txt → ...yles/config/vocabularies/words/accept.txt b/...config/vale/styles/Vocab/words/accept.txt → ...yles/config/vocabularies/words/accept.txt
@@ -1,18 +1,18 @@
+[A-Z]+s
 Bitwarden
+bot
 Cyber
 Dependabot
 Gitleaks
 Grype
+idempotence
 OAuth
 Octokit
+onboarding
 Podman
 Python
+sed
 Syft
 Terraform
-Trufflehog
-bot
-idempotence
-onboarding
-sed
 toolchain
-[A-Z]+s
+Trufflehog
diff --git a/...config/vale/styles/Vocab/words/reject.txt → ...yles/config/vocabularies/words/reject.txt b/...config/vale/styles/Vocab/words/reject.txt → ...yles/config/vocabularies/words/reject.txt