Commit 2b3f10ad authored by Alain Takoudjou's avatar Alain Takoudjou

start upgrade of gitlab v14.10

parent ee5d36ae
...@@ -31,7 +31,6 @@ extends = ...@@ -31,7 +31,6 @@ extends =
../../component/logrotate/buildout.cfg ../../component/logrotate/buildout.cfg
parts = parts =
golang1.15
git git
postgresql postgresql
cmake cmake
...@@ -64,9 +63,13 @@ parts = ...@@ -64,9 +63,13 @@ parts =
revision = 571d6514f7290e8faa9439c4b86aa2f6c87df261 revision = 571d6514f7290e8faa9439c4b86aa2f6c87df261
[nodejs] [nodejs]
<= nodejs-14.16.0 <= nodejs-16.19.0
[yarn] [yarn]
<= yarn-1.16.0 <= yarn-1.22.15
[golang]
<= golang1.16
[ruby]
<= ruby2.7
# Gitlab backup (git-backup) is failing (segfault) with recent git version > 2.30.9 # Gitlab backup (git-backup) is failing (segfault) with recent git version > 2.30.9
# We will use git 2.30.9 version for production upgrade # We will use git 2.30.9 version for production upgrade
...@@ -76,9 +79,10 @@ url = https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.30.9.tar.xz ...@@ -76,9 +79,10 @@ url = https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.30.9.tar.xz
md5sum = c1d42936036cc44a448738329c821569 md5sum = c1d42936036cc44a448738329c821569
[libgit2] [libgit2]
# This version is for rugged 1.1.0 needed by gitlab and gitaly 13.12.15, # This version is for rugged 1.2.0 needed by gitlab and gitaly 14.10.5,
# see: https://github.com/libgit2/rugged/tree/v1.1.0/vendor # see: https://github.com/libgit2/rugged/tree/v1.2.0/vendor
version = 1.1.0 version = 1.2.0
md5sum = 72825e8dc26c7360910a9dee070b8122
############################ ############################
# Software compilation # # Software compilation #
...@@ -164,19 +168,19 @@ git-executable = ${git:location}/bin/git ...@@ -164,19 +168,19 @@ git-executable = ${git:location}/bin/git
[gitlab-repository] [gitlab-repository]
<= git-repository <= git-repository
repository = https://lab.nexedi.com/nexedi/gitlab-ce.git repository = https://lab.nexedi.com/nexedi/gitlab-ce.git
revision = v13.12.15-5-gcb950ba016 branch = v14.10.5-nxd
location = ${buildout:parts-directory}/gitlab location = ${buildout:parts-directory}/gitlab
[gitlab-shell-repository] [gitlab-shell-repository]
<= git-repository <= git-repository
repository = https://gitlab.com/gitlab-org/gitlab-shell.git repository = https://gitlab.com/gitlab-org/gitlab-shell.git
revision = v13.18.1 revision = v13.25.1
location = ${buildout:parts-directory}/gitlab-shell location = ${buildout:parts-directory}/gitlab-shell
[gitaly-repository] [gitaly-repository]
<= git-repository <= git-repository
repository = https://gitlab.com/gitlab-org/gitaly.git repository = https://gitlab.com/gitlab-org/gitaly.git
revision = v13.12.15 revision = v14.10.5
location = ${buildout:parts-directory}/gitaly location = ${buildout:parts-directory}/gitaly
# build needed-by-gitlab gems via bundler # build needed-by-gitlab gems via bundler
...@@ -233,7 +237,7 @@ make-targets= cd ${go_github.com_libgit2_git2go:location} ...@@ -233,7 +237,7 @@ make-targets= cd ${go_github.com_libgit2_git2go:location}
&& make install-static && make install-static
environment = environment =
PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
PATH=${cmake:location}/bin:${pkgconfig:location}/bin:${git:location}/bin:${golang1.15:location}/bin:${buildout:bin-directory}:%(PATH)s PATH=${cmake:location}/bin:${pkgconfig:location}/bin:${git:location}/bin:${golang:location}/bin:${buildout:bin-directory}:%(PATH)s
GOPATH=${gowork:directory} GOPATH=${gowork:directory}
[gowork.goinstall] [gowork.goinstall]
...@@ -241,7 +245,7 @@ git2go = ${go_github.com_libgit2_git2go_prepare:path}/static-build/install ...@@ -241,7 +245,7 @@ git2go = ${go_github.com_libgit2_git2go_prepare:path}/static-build/install
command = bash -c ". ${gowork:env.sh} && CGO_CFLAGS=-I${:git2go}/include CGO_LDFLAGS='-L${:git2go}/lib -lgit2' go install ${gowork:buildflags} -v $(echo -n '${gowork:install}' |tr '\n' ' ') && go test -v lab.nexedi.com/kirr/git-backup" command = bash -c ". ${gowork:env.sh} && CGO_CFLAGS=-I${:git2go}/include CGO_LDFLAGS='-L${:git2go}/lib -lgit2' go install ${gowork:buildflags} -v $(echo -n '${gowork:install}' |tr '\n' ' ') && go test -v lab.nexedi.com/kirr/git-backup"
[gowork] [gowork]
golang = ${golang1.15:location} golang = ${golang:location}
install = install =
lab.nexedi.com/kirr/git-backup lab.nexedi.com/kirr/git-backup
cpkgpath = cpkgpath =
...@@ -279,9 +283,6 @@ make-targets = ...@@ -279,9 +283,6 @@ make-targets =
. ${gowork:env.sh} && . ${gowork:env.sh} &&
unset GOBIN && unset GOBIN &&
make make
post-install =
# solve the problem error="not executable: ruby/git-hooks/pre-receive"
chmod 755 ${:path}/ruby/git-hooks/gitlab-shell-hook
environment = environment =
PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig:${icu:location}/lib/pkgconfig:${libgit2:location}/lib/pkgconfig PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig:${icu:location}/lib/pkgconfig:${libgit2:location}/lib/pkgconfig
PATH=${cmake:location}/bin:${pkgconfig:location}/bin:${ruby:location}/bin:%(PATH)s PATH=${cmake:location}/bin:${pkgconfig:location}/bin:${ruby:location}/bin:%(PATH)s
......
Markdown is supported
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