Skip to content

Commit ccaaca6

Browse files
authored
Merge pull request #282 from olegsu/master
chore: update golangci-lint to v1.30.0
2 parents ac02684 + ac565b5 commit ccaaca6

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.golangci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
run:
2-
deadline: 4m
2+
timeout: 5m
33
skip-dirs:
44
skip-files:
55

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ test: test-style
5353
go vet $(GO_FILES)
5454
test-style: setup
5555
@echo "==> Running static validations and linters <=="
56-
# Setting deadline to 5m as deafult is 1m
57-
golangci-lint run --deadline=5m
56+
# Setting timeout to 5m as deafult is 1m
57+
golangci-lint run --timeout=5m
5858
sanity-test:
5959
go test -v ./test/sanity
6060
build: setup
@@ -72,7 +72,7 @@ setup: clean
7272
$Q go env
7373

7474
ifndef HAS_GOLANGCI
75-
curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(GOPATH)/bin v1.19.1
75+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOPATH)/bin v1.30.0
7676
endif
7777

7878
.PHONY: mod

0 commit comments

Comments
 (0)