diff --git a/.tool-versions b/.tool-versions index 0c02acd7..f4e08985 100644 --- a/.tool-versions +++ b/.tool-versions @@ -3,6 +3,8 @@ terraform 1.7.0 pre-commit 3.6.0 vale 3.6.0 +poetry 2.1.1 +act 0.2.74 # ============================================================================== # The section below is reserved for Docker image versions. diff --git a/README.md b/README.md index b7c1302f..50443932 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,7 @@ cd nhs-england-tools/repository-template The following software packages, or their equivalents, are expected to be installed and configured: - [Docker](https://www.docker.com/) container runtime or a compatible tool, e.g. [Podman](https://podman.io/), +- [asdf](https://asdf-vm.com/) version manager, - [GNU make](https://www.gnu.org/software/make/) 3.82 or later, > [!NOTE]
@@ -71,7 +72,7 @@ The following software packages, or their equivalents, are expected to be instal Installation and configuration of the toolchain dependencies ```shell -$ make install +make install ``` ## Usage diff --git a/scripts/config/pre-commit.yaml b/scripts/config/pre-commit.yaml index 37ca6375..73a62de2 100644 --- a/scripts/config/pre-commit.yaml +++ b/scripts/config/pre-commit.yaml @@ -1,4 +1,16 @@ repos: +- repo: https://github.com/pre-commit/pre-commit-hooks + rev: v4.0.1 + hooks: + - id: check-added-large-files + - id: check-case-conflict + - id: check-merge-conflict + - id: check-yaml + - id: detect-aws-credentials + args: [--allow-missing-credentials] + - id: end-of-file-fixer + - id: trailing-whitespace + - id: mixed-line-ending - repo: local hooks: - id: scan-secrets @@ -38,3 +50,19 @@ repos: entry: ./scripts/githooks/check-terraform-format.sh language: script pass_filenames: false +- repo: https://github.com/astral-sh/ruff-pre-commit + rev: v0.9.7 + hooks: + - id: ruff + args: [ --fix ] + - id: ruff-format +- repo: https://github.com/RobertCraigie/pyright-python + rev: v1.1.394 + hooks: + - id: pyright +- repo: https://github.com/milin/giticket + rev: v1.3 + hooks: + - id: giticket + args: [ '--regex=(?i)ELID-\d+', '--format=[{ticket}] {commit_msg}', '--mode=regex_match' ] + stages: [commit-msg]