Skip to content

Commit 8fd16e2

Browse files
committed
Update lint-fix make target
1 parent 0e9d941 commit 8fd16e2

File tree

2 files changed

+3
-18
lines changed

2 files changed

+3
-18
lines changed

Makefile

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,11 @@ PULL_BASE_SHA ?= master
4444

4545
.PHONY: lint
4646
lint:
47-
hack/golangci-lint.sh run --new-from-rev=${PULL_BASE_SHA}
47+
hack/golangci-lint.sh run --new-from-rev=${PULL_BASE_SHA} ${EXTRA_ARGS}
4848

49-
# While https://github.com/golangci/golangci-lint/issues/1779 is not fixed,
50-
# we need to run the fix separately from the lint command.
51-
# GolangCI-Lint will not actually run the fixer for us.
52-
# In the future we can remove this and have the linter auto-fix.
5349
.PHONY: lint-fix
54-
lint-fix:
55-
hack/lint-fix.sh
50+
lint-fix: EXTRA_ARGS=--fix
51+
lint-fix: lint
5652

5753
# Ignore the exit code of the fix lint, it will always error as there are unfixed issues
5854
# that cannot be fixed from historic commits.

hack/lint-fix.sh

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)