[arch-commits] Commit in gitlab-gitaly/trunk (PKGBUILD)
Sven-Hendrik Haase
svenstaro at archlinux.org
Sun Dec 23 00:35:05 UTC 2018
Date: Sunday, December 23, 2018 @ 00:35:04
Author: svenstaro
Revision: 417580
upgpkg: gitlab-gitaly 1.12.0-1
This uses the default Ruby version 2.5 again instead of ruby2.3.
Modified:
gitlab-gitaly/trunk/PKGBUILD
----------+
PKGBUILD | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-12-23 00:31:34 UTC (rev 417579)
+++ PKGBUILD 2018-12-23 00:35:04 UTC (rev 417580)
@@ -1,19 +1,22 @@
# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# NOTE: Gitlab isn't always compatible with modern Ruby versions. In that case, check the
+# commit log for an old fix on how to tell it to use older versions of Ruby. I'm afraid we'll
+# need this again at some point in the future.
pkgname=gitlab-gitaly
-pkgver=1.4.0
+pkgver=1.12.0
pkgrel=1
pkgdesc="Speed up Git access using caching"
arch=('x86_64')
url="https://gitlab.com/gitlab-org/gitaly"
license=('MIT')
-depends=(glibc ruby2.3 libxml2 libxslt)
+depends=(glibc ruby libxml2 libxslt)
options=(!buildflags)
-makedepends=(go ruby2.3-bundler cmake)
+makedepends=(go ruby-bundler cmake)
backup=("etc/gitlab-gitaly/config.toml")
source=("${pkgname}-${pkgver}.tar.gz::https://gitlab.com/api/v4/projects/gitlab-org%2Fgitaly/repository/archive?sha=v${pkgver}"
"gitlab-gitaly.service")
-sha512sums=('89466969d6741346717a7b55aeecbfcb9b0da82cd40e9ad4dc7b07a7560a1dd668dc27d275a06ce415b02c75989a258a49a73a9252d820be32cc790a19e9e9c0'
+sha512sums=('3a97ebbaac1cff259c6ce9ab13758bc4dfc66e92d144da3c9dc7966281f4375f4fd42c6d02e05a8bb8cf375dd69745232505d836339918fc6e0061ff4e399c5d'
'b330c0f42592322ad2131079ca554a13a364007182dded8c556198caff2c9ec642acf5bb7dfecb05de5a3d89bffec6588b6d05c8c7c5c771a46df3d296deed28')
_homedir="/var/lib/gitlab"
@@ -21,16 +24,7 @@
prepare() {
cd "gitaly-"*
- sed -i "s/bundle install/bundle-2.3 install/" Makefile
- sed -i "s/bundle config/bundle-2.3 config/" Makefile
- sed -i "s/bundle show/bundle-2.3 show/" Makefile
- sed -i "s/bundle/bundle-2.3/" internal/rubyserver/rubyserver.go
- sed -i "s/bundle/bundle-2.3/" internal/linguist/linguist.go
- sed -i "s/bundle/bundle-2.3/" _support/makegen.go
- sed -i "s/\"ruby\"/\"ruby-2.3\"/" internal/linguist/linguist.go
sed -i "s/VERSION = .*/VERSION = ${pkgver}/" Makefile
- sed -i "s/env ruby/env ruby-2.3/" ruby/bin/gitaly-ruby
- sed -i "s/env ruby/env ruby-2.3/" ruby/bin/ruby-cd
sed -i "s|dir = \"/home/git/gitaly/ruby\"|dir = \"/usr/share/webapps/gitlab-gitaly/ruby\"|" config.toml.example
sed -i "s|dir = \"/home/git/gitlab-shell\"|dir = \"/usr/share/webapps/gitlab-shell\"|" config.toml.example
sed -i "s|bin_dir = \"/home/git/gitaly\"|bin_dir = \"/usr/bin\"|" config.toml.example
More information about the arch-commits
mailing list