diff options
| author | Paul Okstad <pokstad@gitlab.com> | 2019-05-31 18:14:28 +0300 |
|---|---|---|
| committer | Paul Okstad <pokstad@gitlab.com> | 2019-05-31 18:14:28 +0300 |
| commit | 6bfa87e47d01984a4dca67bce74bacd3f02de3f2 (patch) | |
| tree | 8b633ca0980dc5386a031df60a28cd9d892d26ad | |
| parent | 8e6649fed6997589bafea3b3410637fa67a8f3c1 (diff) | |
| parent | 7ee050d9e8edb3f5fdc71ae76bc04286b20ae268 (diff) | |
Merge branch 'jv-speed-up-assemble' into 'master'
Speed up 'make assemble' using rsync
See merge request gitlab-org/gitaly!1272
| -rw-r--r-- | _support/makegen.go | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/jv-speed-up-assemble.yml | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/_support/makegen.go b/_support/makegen.go index d0bef95dc..70578f533 100644 --- a/_support/makegen.go +++ b/_support/makegen.go @@ -353,10 +353,10 @@ assemble-go: build .PHONY: assemble-ruby assemble-ruby: - rm -rf $(ASSEMBLY_ROOT)/ruby mkdir -p $(ASSEMBLY_ROOT) rm -rf {{ .GitalyRubyDir }}/tmp {{ .GitlabShellDir }}/tmp - cp -r {{ .GitalyRubyDir }} $(ASSEMBLY_ROOT)/ruby + mkdir -p $(ASSEMBLY_ROOT)/ruby/ + rsync -a --delete {{ .GitalyRubyDir }}/ $(ASSEMBLY_ROOT)/ruby/ rm -rf $(ASSEMBLY_ROOT)/ruby/spec $(ASSEMBLY_ROOT)/{{ .GitlabShellRelDir }}/spec $(ASSEMBLY_ROOT)/{{ .GitlabShellRelDir }}/gitlab-shell.log binaries: assemble diff --git a/changelogs/unreleased/jv-speed-up-assemble.yml b/changelogs/unreleased/jv-speed-up-assemble.yml new file mode 100644 index 000000000..ad388e71a --- /dev/null +++ b/changelogs/unreleased/jv-speed-up-assemble.yml @@ -0,0 +1,5 @@ +--- +title: Speed up 'make assemble' using rsync +merge_request: 1272 +author: +type: other |