Browse Source

Merge pull request #41560 from thaJeztah/fix_golang_ci_lint_version

Dockerfile: fix golang-ci-lint installer
Sebastiaan van Stijn 4 years ago
parent
commit
bebbec4e89
1 changed files with 4 additions and 13 deletions
  1. 4 13
      hack/dockerfile/install/golangci_lint.installer

+ 4 - 13
hack/dockerfile/install/golangci_lint.installer

@@ -3,17 +3,8 @@
 : "${GOLANGCI_LINT_COMMIT=v1.23.8}"
 
 install_golangci_lint() {
-	echo "Installing golangci-lint version ${GOLANGCI_LINT_COMMIT}"
-	go get -d github.com/golangci/golangci-lint/cmd/golangci-lint
-	cd "$GOPATH/src/github.com/golangci/golangci-lint/" || exit 1
-	git checkout -q "${GOLANGCI_LINT_COMMIT}"
-
-	version="$(git describe --tags)"
-	commit="$(git rev-parse --short HEAD)"
-	commitDate="$(git show -s --format=%cd)"
-
-	go build \
-		${GO_BUILDMODE} \
-		-ldflags "-s -w -X \"main.version=${version}\" -X \"main.commit=${commit}\" -X \"main.date=${commitDate}\"" \
-		-o "${PREFIX}/golangci-lint" "github.com/golangci/golangci-lint/cmd/golangci-lint"
+	set -e
+	export GO111MODULE=on
+	GOBIN="${PREFIX}" go get "github.com/golangci/golangci-lint/cmd/golangci-lint@${GOLANGCI_LINT_COMMIT}"
+	"${PREFIX}"/golangci-lint --version
 }