diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-04-23 15:35:43 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-04-23 15:35:43 +0300 |
| commit | c2fb2a8f8aa79e390b920f7b7c061e2951e69566 (patch) | |
| tree | 41593340a1c6f950e3983c243f8bb8883f4cdb34 | |
| parent | 1959e752a7ab0d78990c9a537aefc79f2c13f5d7 (diff) | |
| parent | c0c514dd106dce4d70fd859dce3206ba7f3a3bed (diff) | |
Merge branch 'golang-lint-download-fix' into 'master'
Work around golang.org/x/lint download trouble
See merge request gitlab-org/gitlab-pages!89
| -rw-r--r-- | .gitignore | 8 | ||||
| -rw-r--r-- | Makefile.build.mk | 12 | ||||
| -rw-r--r-- | Makefile.internal.mk | 14 |
3 files changed, 12 insertions, 22 deletions
@@ -5,11 +5,3 @@ shared/pages/.update # Used by the makefile /.GOPATH /bin - -# Added by `make setup` -/vendor/manifest -/vendor/github.com/fzipp/gocyclo/ -/vendor/golang.org/x/tools/ -/vendor/github.com/wadey/gocovmerge/ -/vendor/github.com/golang/lint/ -/vendor/golang.org/x/lint/ diff --git a/Makefile.build.mk b/Makefile.build.mk index 70f446d4..89ec29de 100644 --- a/Makefile.build.mk +++ b/Makefile.build.mk @@ -3,11 +3,13 @@ all: gitlab-pages setup: clean .GOPATH/.ok - go get -u github.com/FiloSottile/gvt - - ./bin/gvt fetch golang.org/x/tools/cmd/goimports - - ./bin/gvt fetch github.com/wadey/gocovmerge - - ./bin/gvt fetch github.com/golang/lint/golint - - ./bin/gvt fetch github.com/fzipp/gocyclo + go get golang.org/x/tools/cmd/goimports + # Workaround for broken 'go get golang.org/x/lint' due to Google hosting problems + git clone --quiet https://github.com/golang/lint $(GOPATH)/src/golang.org/x/lint + go install golang.org/x/lint/golint + go get golang.org/x/tools/cmd/goimports + go get github.com/wadey/gocovmerge + go get github.com/fzipp/gocyclo build: .GOPATH/.ok $Q go install $(if $V,-v) $(VERSION_FLAGS) $(IMPORT_PATH) diff --git a/Makefile.internal.mk b/Makefile.internal.mk index 309083ff..1cbb09ed 100644 --- a/Makefile.internal.mk +++ b/Makefile.internal.mk @@ -34,20 +34,16 @@ Q := $(if $V,,@) $Q ln -s ../bin .GOPATH/bin $Q touch $@ -.PHONY: bin/gocovmerge bin/goimports +.PHONY: bin/gocovmerge bin/goimports bin/gocyclo bin/golint bin/gocovmerge: .GOPATH/.ok - @test -d ./vendor/github.com/wadey/gocovmerge || \ + @test -x $@ || \ { echo "Vendored gocovmerge not found, try running 'make setup'..."; exit 1; } - $Q go install $(IMPORT_PATH)/vendor/github.com/wadey/gocovmerge bin/gocyclo: .GOPATH/.ok - @test -d ./vendor/github.com/fzipp/gocyclo || \ + @test -x $@ || \ { echo "Vendored gocyclo not found, try running 'make setup'..."; exit 1; } - $Q go get github.com/fzipp/gocyclo bin/goimports: .GOPATH/.ok - @test -d ./vendor/golang.org/x/tools/cmd/goimports || \ + @test -x $@ || \ { echo "Vendored goimports not found, try running 'make setup'..."; exit 1; } - $Q go install $(IMPORT_PATH)/vendor/golang.org/x/tools/cmd/goimports bin/golint: .GOPATH/.ok - @test -d ./vendor/github.com/golang/lint/golint || \ + @test -x $@ || \ { echo "Vendored golint not found, try running 'make setup'..."; exit 1; } - $Q go install $(IMPORT_PATH)/vendor/github.com/golang/lint/golint |