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

gitlab: upgrade to 14.5.3

parent 228a27a8
GITLAB_VERSION=14.4.5
GITLAB_MAJOR_VERSION=14.4
GITLAB_WORKHORSE_VERSION=14.4.5
GITALY_SERVER_VERSION=14.4.5
GITLAB_SHELL_VERSION=13.21.1
GITLAB_VERSION=14.5.3
GITLAB_MAJOR_VERSION=14.5
GITLAB_WORKHORSE_VERSION=14.5.3
GITALY_SERVER_VERSION=14.5.3
GITLAB_SHELL_VERSION=13.22.1
......@@ -21,10 +21,8 @@ gitaly() {
cd /tmp/src
echo test
patch -p0 -i /tmp/patches/gitaly-remove-ruby-bundle-from-build.patch
patch -p0 -i /tmp/patches/gitaly-set-defaults.patch
apply_patch -p0 -i /tmp/patches/gitaly-remove-ruby-bundle-from-build.patch
apply_patch -p0 -i /tmp/patches/gitaly-set-defaults.patch
make build
make install DESTDIR=/tmp/gitaly/
......
diff --git a/Makefile b/Makefile
index 1d63621..19c81ff 100644
index 2034afdb4..8ccf99feb 100644
--- Makefile
+++ Makefile
@@ -242,7 +242,7 @@ all: INSTALL_DEST_DIR = ${SOURCE_DIR}
@@ -282,7 +282,7 @@ help:
.PHONY: build
## Build Go binaries and install required Ruby Gems.
-build: ${SOURCE_DIR}/.ruby-bundle libgit2
+build: libgit2
go install ${GO_LDFLAGS} -tags "${GO_BUILD_TAGS}" $(addprefix ${GITALY_PACKAGE}/cmd/, $(call find_commands))
# We use version suffix for the gitaly-git2go binary to support compatibility contract between
# gitaly and gitaly-git2go during upgrade deployment.
${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
......@@ -9,7 +9,6 @@ set -eu -o pipefail
build_gitlab_shell() {
apk add make patch rdfind
apply_patch -i /tmp/makefile-fix-version.patch
apply_patch -p0 -i /tmp/gitlab-shell-changes.patch
make build
......
diff --git a/Makefile b/Makefile
index 88daed3..94836d3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
.PHONY: validate verify verify_ruby verify_golang test test_ruby test_golang coverage coverage_golang setup _script_install build compile check clean install
GO_SOURCES := $(shell find . -name '*.go')
-VERSION_STRING := $(shell git describe --match v* 2>/dev/null || awk '$0="v"$0' VERSION 2>/dev/null || echo unknown)
+VERSION_STRING := $(shell git describe --match v* 2>/dev/null || awk '$$0="v"$$0' VERSION 2>/dev/null || echo unknown)
BUILD_TIME := $(shell date -u +%Y%m%d.%H%M%S)
BUILD_TAGS := tracer_static tracer_static_jaeger continuous_profiler_stackdriver
GOBUILD_FLAGS := -ldflags "-X main.Version=$(VERSION_STRING) -X main.BuildTime=$(BUILD_TIME)" -tags "$(BUILD_TAGS)"
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