Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKim Carlbäcker <kim.carlbacker@gmail.com>2018-05-31 19:43:43 +0300
committerKim Carlbäcker <kim.carlbacker@gmail.com>2018-05-31 19:43:43 +0300
commita44cd4a1a9322c8f1f90186eaf5b031a56e9019d (patch)
treee2ba14f4e52922bd5117a567db61321c071eb8d4
parent23b02b7a1eec41875fe7cb9ea61559ea4eadd3b5 (diff)
parentfa302c0dfd131aa4c9dcd0ccf71b0f664c45ae87 (diff)
Merge branch 'remove-golint-download-workaround' into 'master'
Remove golint download workaround See merge request gitlab-org/gitaly!746
-rw-r--r--Makefile9
1 files changed, 1 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index a47e6a7b7..7ec1b220b 100644
--- a/Makefile
+++ b/Makefile
@@ -196,14 +196,7 @@ $(GOVENDOR): $(TARGET_SETUP)
# Install golint
$(GOLINT): $(TARGET_SETUP)
- # We should run only this: go get -v golang.org/x/lint/golint
- # But that is currently (2018-04-23) broken so we have this clunky workaround.
- mkdir -p $(GOPATH)/src/golang.org/x
- rm -rf $(GOPATH)/src/golang.org/x/lint
- git clone --quiet https://github.com/golang/lint $(GOPATH)/src/golang.org/x/lint
- rm -rf $(GOPATH)/src/golang.org/x/tools
- git clone --quiet https://github.com/golang/tools $(GOPATH)/src/golang.org/x/tools
- go install golang.org/x/lint/golint
+ go get -v golang.org/x/lint/golint
# Install gocovmerge
$(GOCOVMERGE): $(TARGET_SETUP)