Skip to content

Commit

Permalink
Merge pull request #1071 from saschagrunert/golangci-lint
Browse files Browse the repository at this point in the history
Update golangci-lint and config
  • Loading branch information
openshift-merge-robot authored Feb 1, 2023
2 parents 121dbff + 3eddea8 commit 0006b97
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- uses: actions/checkout@v3
- uses: golangci/golangci-lint-action@v3
with:
version: v1.49.0
version: v1.50.1
only-new-issues: true

get-script:
Expand Down
2 changes: 2 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ linters:
- depguard
- dogsled
- dupl
- dupword
- durationcheck
- errcheck
- errchkjson
Expand Down Expand Up @@ -76,6 +77,7 @@ linters:
- stylecheck
- tagliatelle
- tenv
- testableexamples
- testpackage
- thelper
- tparallel
Expand Down
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ TEST_FLAGS ?=
PACKAGE_NAME ?= $(shell cargo metadata --no-deps --format-version 1 | jq -r '.packages[2] | [ .name, .version ] | join("-v")')
PREFIX ?= /usr
CI_TAG ?=
GOLANGCI_LINT_VERSION := v1.50.1

default:
cargo build
Expand Down Expand Up @@ -57,7 +58,7 @@ integration-static: .install.ginkgo # It needs to be release so we correctly tes

.install.golangci-lint:
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | \
BINDIR=$(abspath $(GOTOOLS_BINDIR)) sh -s v1.49.0
BINDIR=$(abspath $(GOTOOLS_BINDIR)) sh -s $(GOLANGCI_LINT_VERSION)

clean:
rm -rf target/
Expand Down

0 comments on commit 0006b97

Please sign in to comment.