Skip to content

Set up repo to allow use of pre-commit (via existing make) #11

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

Merged
eddalmond1 merged 4 commits into from
Feb 21, 2025
Merged

Set up repo to allow use of pre-commit (via existing make) #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
57339c7
ELI-78 - adding .pre-commit-config.yaml to gitignore so that devs tha…
eddalmond1 Feb 21, 2025
3137438
eli-96 adding poetry and act to .tool-versions, and updating readme, …
eddalmond1 Feb 21, 2025
1f5d7b5
eli-96 updating repo pre-commit template with additional hooks for ru…
eddalmond1 Feb 21, 2025
94afb1c
eli-96 fixing markdown linting
eddalmond1 Feb 21, 2025
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
2 changes: 2 additions & 0 deletions .tool-versions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]<br>
Expand All @@ -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
Expand Down
28 changes: 28 additions & 0 deletions scripts/config/pre-commit.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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]
Loading