From d2fa4030cf944ff6f2f3713f382116273d461b71 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 31 Jul 2024 14:11:57 -0500 Subject: [PATCH 1/2] fix formatting in CONTRIBUTING docs (#66) Signed-off-by: James Lamb --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5b2d744..ec5be78 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -45,6 +45,7 @@ $ pre-commit install pre-commit installed at .git/hooks/pre-commit $ pre-commit run --all-files +``` ## Signing Your Work From 2e70e2bb289c6e5a5180c8deefd86f2150256343 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 1 Aug 2024 04:38:49 -0500 Subject: [PATCH 2/2] upgrade golangci-lint, run pre-commit in CI, add more pre-commit hooks (#67) * upgrade golangci-lint, run pre-commit in CI, add more pre-commit hooks Signed-off-by: James Lamb * remove setup-python Signed-off-by: James Lamb --------- Signed-off-by: James Lamb --- .github/workflows/lint.yaml | 10 +++++----- .pre-commit-config.yaml | 7 ++++++- CONTRIBUTING.md | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index ac0ffb3..4f4d421 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -4,13 +4,13 @@ jobs: lint: runs-on: ubuntu-latest steps: + - name: Checkout source + uses: actions/checkout@v4 + - name: Install Go uses: actions/setup-go@v5 with: go-version: 1.21.x - - name: Checkout source - uses: actions/checkout@v4 - - - name: golangci-lint - uses: golangci/golangci-lint-action@v4 + - name: Run pre-commit + uses: pre-commit/action@v3.0.1 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b34a2a4..b251317 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,6 +2,11 @@ # See https://pre-commit.com/hooks.html for more hooks repos: - repo: https://github.com/golangci/golangci-lint - rev: v1.41.1 + rev: v1.59.1 hooks: - id: golangci-lint +- repo: https://github.com/pre-commit/pre-commit-hooks + rev: v4.6.0 + hooks: + - id: trailing-whitespace + - id: end-of-file-fixer diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ec5be78..435f429 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -41,7 +41,7 @@ PASS This project enforces linting with `golangci-lint`. You can use [pre-commit](https://pre-commit.com/) to check this automatically on commit, which will save time as you can catch linting errors before the CI does. ```console -$ pre-commit install +$ pre-commit install pre-commit installed at .git/hooks/pre-commit $ pre-commit run --all-files