diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index b92cffdd5..623834141 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -36,7 +36,6 @@ jobs: uses: golangci/golangci-lint-action@3a919529898de77ec3da873e3063ca4b10e7f5cc # v3.7.0 with: args: --timeout 10m0s - only-new-issues: true njs-lint: name: NJS Lint diff --git a/.golangci.yml b/.golangci.yml index fbdd3f462..1afc5317b 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -9,7 +9,6 @@ linters-settings: - name: blank-imports - name: context-as-argument - name: context-keys-type - - name: dot-imports - name: empty-block - name: error-naming - name: error-return diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 93427e930..f3e1e6148 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -34,20 +34,10 @@ repos: types: - javascript - - repo: local - hooks: - - id: golang-diff - name: create-go-diff - entry: bash -c 'git diff -p origin/main > /tmp/diff.patch' - language: system - types: [go] - pass_filenames: false - - repo: https://github.com/golangci/golangci-lint - rev: v1.54.2 + rev: v1.55.0 hooks: - - id: golangci-lint - args: [--new-from-patch=/tmp/diff.patch] + - id: golangci-lint-full # Rules are in .markdownlint-cli2.yaml file # See https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md for rule descriptions @@ -64,5 +54,5 @@ repos: - id: yamllint ci: - skip: [golang-diff, golangci-lint, prettier, markdownlint-cli2-fix, yamllint] + skip: [golangci-lint-full, prettier, markdownlint-cli2-fix, yamllint] autofix_prs: false