diff options
| author | John Cai <jcai@gitlab.com> | 2019-06-18 19:41:09 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2019-06-18 19:41:09 +0300 |
| commit | 43744e7958e4ce7fef1c2000b3a2c68bbf64ccef (patch) | |
| tree | 4b3b0b86c8a20f09d0eb5588be2902e690ae71c8 | |
| parent | 54ccb9ae9ec753d2037bec136bfc9eaecac44110 (diff) | |
| parent | 6a9cc6742e7b19f0a924b2590458c0ff45d8c586 (diff) | |
Merge branch '1739-govendor-fails-during-make-verify' into 'master'
Resolve "govendor fails during `make verify`"
Closes #1739
See merge request gitlab-org/gitaly!1317
| -rw-r--r-- | _support/makegen.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/_support/makegen.go b/_support/makegen.go index c74aa5f99..3227f1240 100644 --- a/_support/makegen.go +++ b/_support/makegen.go @@ -473,7 +473,7 @@ notice: notice-tmp notice-tmp: {{ .GoVendor }} clean-ruby-vendor-go rm -rf {{ .SourceDir }}/vendor cd {{ .SourceDir }} && go mod vendor - cd {{ .GopathSourceDir }} && env GOPATH={{ .BuildDir }} govendor license -template _support/notice.template -o {{ .BuildDir }}/NOTICE + cd {{ .GopathSourceDir }} && env GOPATH={{ .BuildDir }} GO111MODULE=off govendor license -template _support/notice.template -o {{ .BuildDir }}/NOTICE .PHONY: clean-ruby-vendor-go clean-ruby-vendor-go: |