diff options
| author | Alejandro Rodríguez <alejorro70@gmail.com> | 2018-10-26 19:06:31 +0300 |
|---|---|---|
| committer | Alejandro Rodríguez <alejorro70@gmail.com> | 2018-10-26 19:06:31 +0300 |
| commit | ea5f1fb37731242f751340d47576c9824ac31c67 (patch) | |
| tree | 8446563daf904a1bf98a6d23ad63c5fd0a72bdc0 | |
| parent | c6c262dc6f3246693407ce72a4a4736b9cd293b0 (diff) | |
| parent | 5acb476a51436ddb68227727eaac07788dbc20e4 (diff) | |
Merge branch 'fix-find-vendor' into 'master'
Fix makefile 'find ruby/vendor' bug
See merge request gitlab-org/gitaly!946
| -rw-r--r-- | _support/makegen.go | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-find-vendor.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/_support/makegen.go b/_support/makegen.go index 632b460f3..949fed8f3 100644 --- a/_support/makegen.go +++ b/_support/makegen.go @@ -364,7 +364,7 @@ notice: {{ .GoVendor }} clean-ruby-vendor-go .PHONY: clean-ruby-vendor-go clean-ruby-vendor-go: - cd {{ .SourceDir }} && find ruby/vendor -type f -name '*.go' -delete + cd {{ .SourceDir }} && mkdir -p ruby/vendor && find ruby/vendor -type f -name '*.go' -delete .PHONY: govendor-tagged govendor-tagged: {{ .GoVendor }} diff --git a/changelogs/unreleased/fix-find-vendor.yml b/changelogs/unreleased/fix-find-vendor.yml new file mode 100644 index 000000000..95c428b9c --- /dev/null +++ b/changelogs/unreleased/fix-find-vendor.yml @@ -0,0 +1,5 @@ +--- +title: Fix makefile 'find ruby/vendor' bug +merge_request: 946 +author: +type: fixed |