Commit e0ddfd20 authored by Kevin Daudt's avatar Kevin Daudt 💻
Browse files

gitaly: use upstream provision to skip building ruby

We patched the Makefile to prevent the ruby component from being built
in the golang stage. But upstream already has a provision for this. By
creating the .ruby-bundle file, the target is already satisfied, so it
will be built. So let's use that.
parent dcf6b301
......@@ -21,9 +21,11 @@ gitaly() {
cd /tmp/src
apply_patch -p1 -i /tmp/patches/gitaly-remove-ruby-bundle-from-build.patch
apply_patch -p0 -i /tmp/patches/gitaly-set-defaults.patch
# Skip building ruby components, which will done in a separate stage
touch /tmp/src/.ruby-bundle
make build
make install DESTDIR=/tmp/gitaly/
diff --git a/Makefile b/Makefile
index 1149b093a..b544c839b 100644
--- a/Makefile
+++ b/Makefile
@@ -289,7 +289,7 @@ help:
.PHONY: build
## Build Go binaries and install required Ruby Gems.
-build: ${SOURCE_DIR}/.ruby-bundle libgit2
+build: libgit2
@ # We used to install Gitaly binaries into the source directory by default when executing
@ # "make" or "make all", which has been changed in v14.5 to only build binaries into
@ # `_build/bin`. In order to quickly fail in case any source install still refers to these
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment