Skip to content

Commit

Permalink
hack: move golangci-lint config files
Browse files Browse the repository at this point in the history
Because the script now explicitly selects the configuration file, the files no
longer have to be in the root directory. Having them in hack without the
leading dot is better because they then have the same owners as the script and
are more visible.

The downside is that manual invocations of golangci-lint without the parameter
no longer work.
  • Loading branch information
pohly committed Feb 28, 2023
1 parent 2d513e1 commit cf2e629
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .golangci.yaml → hack/golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ linters-settings: # please keep this alphabetized
custom:
logcheck:
# Installed there by hack/verify-golangci-lint.sh.
path: _output/local/bin/logcheck.so
path: ../_output/local/bin/logcheck.so
description: structured logging checker
original-url: k8s.io/klog/hack/tools
gocritic:
Expand Down
2 changes: 1 addition & 1 deletion hack/verify-golangci-lint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ invocation=(./hack/verify-golangci-lint.sh "$@")
# otherwise golangci-lint will report stale results:
# _output/local/bin/golangci-lint cache clean
golangci=(env LOGCHECK_CONFIG="${KUBE_ROOT}/hack/logcheck.conf" "${GOBIN}/golangci-lint" run)
golangci_config="${KUBE_ROOT}/.golangci.yaml"
golangci_config="${KUBE_ROOT}/hack/golangci.yaml"
golangci+=(--config="${golangci_config}")

kube::golang::verify_go_version
Expand Down

0 comments on commit cf2e629

Please sign in to comment.