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:
authorJacob Vosmaer <jacob@gitlab.com>2018-10-22 22:29:49 +0300
committerZeger-Jan van de Weg <zegerjan@gitlab.com>2018-10-22 22:29:49 +0300
commit74377647f034a7bfbb9f466c5768116cf2e8ccc3 (patch)
treedb48ffcf40e1cc09260c217d795af26fb321cf99 /_support
parente21a73438df5f653062a8deddc3a091905a93c29 (diff)
Don't confuse govendor license with ruby gem .go files
Diffstat (limited to '_support')
-rw-r--r--_support/makegen.go10
1 files changed, 7 insertions, 3 deletions
diff --git a/_support/makegen.go b/_support/makegen.go
index e5f8b5ca0..632b460f3 100644
--- a/_support/makegen.go
+++ b/_support/makegen.go
@@ -354,14 +354,18 @@ govendor-status: {{ .GoVendor }}
go get github.com/kardianos/govendor
.PHONY: notice-up-to-date
-notice-up-to-date: {{ .GoVendor }}
+notice-up-to-date: {{ .GoVendor }} clean-ruby-vendor-go
# notice-up-to-date
@(cd {{ .SourceDir }} && govendor license -template _support/notice.template | cmp - NOTICE) || (echo >&2 "NOTICE requires update: 'make notice'" && false)
-.PHONY: notice
-notice: {{ .GoVendor }}
+.PHONY: notice
+notice: {{ .GoVendor }} clean-ruby-vendor-go
cd {{ .SourceDir }} && govendor license -template _support/notice.template -o NOTICE
+.PHONY: clean-ruby-vendor-go
+clean-ruby-vendor-go:
+ cd {{ .SourceDir }} && find ruby/vendor -type f -name '*.go' -delete
+
.PHONY: govendor-tagged
govendor-tagged: {{ .GoVendor }}
# govendor-tagged