From 102b210f30b14b8f3933270497deb37dd672df76 Mon Sep 17 00:00:00 2001 From: Hugo Gonzalez Labrador Date: Thu, 24 Oct 2019 17:05:11 +0200 Subject: [PATCH] set version for golangci-lint --- Makefile | 2 +- tools/create-artifacts/main.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b46736fd5e..13807eaeae 100644 --- a/Makefile +++ b/Makefile @@ -46,7 +46,7 @@ contrib: # for manual building only deps: - cd /tmp && GO111MODULE=on go get -u github.com/golangci/golangci-lint@v1.21.0 + cd /tmp && rm -rf golangci-lint && git clone --quiet -b 'v1.21.0' --single-branch --depth 1 https://github.com/golangci/golangci-lint &> /dev/null && cd golangci-lint/cmd/golangci-lint && go install cd /tmp && go get golang.org/x/tools/cmd/goimports build-ci: off diff --git a/tools/create-artifacts/main.go b/tools/create-artifacts/main.go index a586103fb3..aa0b7ff056 100644 --- a/tools/create-artifacts/main.go +++ b/tools/create-artifacts/main.go @@ -79,7 +79,7 @@ func main() { out := fmt.Sprintf("./dist/%s_%s_%s_%s", bin, *version, o, arch) args := []string{"build", "-mod=vendor", "-o", out, "-ldflags", ldFlags, "./cmd/" + bin} cmd := exec.Command("go", args...) - cmd.Env = append(os.Environ()) + cmd.Env = os.Environ() cmd.Env = append(cmd.Env, []string{"GOOS=" + o, "GOARCH=" + arch}...) cmd.Dir = "." // root of the repo run(cmd)