Commit 7c8458ce authored by Kevin Daudt's avatar Kevin Daudt 💻
Browse files

gitlab: upgrade to 14.6.4

parent 0aa7bfb2
Pipeline #110064 passed with stages
in 18 minutes and 7 seconds
GITLAB_VERSION=14.5.4
GITLAB_MAJOR_VERSION=14.5
GITLAB_WORKHORSE_VERSION=14.5.4
GITALY_SERVER_VERSION=14.5.4
GITLAB_VERSION=14.6.4
GITLAB_MAJOR_VERSION=14.6
GITLAB_WORKHORSE_VERSION=14.6.4
GITALY_SERVER_VERSION=14.6.4
GITLAB_SHELL_VERSION=13.22.1
......@@ -21,7 +21,7 @@ gitaly() {
cd /tmp/src
apply_patch -p0 -i /tmp/patches/gitaly-remove-ruby-bundle-from-build.patch
apply_patch -p1 -i /tmp/patches/gitaly-remove-ruby-bundle-from-build.patch
apply_patch -p0 -i /tmp/patches/gitaly-set-defaults.patch
make build
......
diff --git a/Makefile b/Makefile
index 2034afdb4..8ccf99feb 100644
--- Makefile
+++ Makefile
@@ -282,7 +282,7 @@ help:
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
${Q}# We used to install Gitaly binaries into the source directory by default when executing
${Q}# "make" or "make all", which has been changed in v14.5 to only build binaries into
${Q}# `_build/bin`. In order to quickly fail in case any source install still refers to these
@ # 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