Skip to content
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

Jump to bottom

Fix pre-commit and action linter #1172

Merged
merged 3 commits into from
Oct 20, 2023
Merged

Fix pre-commit and action linter #1172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3b37f7
Fix pre-commit and action linter
sjberman Oct 20, 2023
983b080
Remove diff patch step
sjberman Oct 20, 2023
982f2c6
Fix ci skip
sjberman Oct 20, 2023
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
1 change: 0 additions & 1 deletion .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ linters-settings:
- name: blank-imports
- name: context-as-argument
- name: context-keys-type
- name: dot-imports
sjberman marked this conversation as resolved.
Show resolved Hide resolved
- name: empty-block
- name: error-naming
- name: error-return
Expand Down
16 changes: 3 additions & 13 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Loading