[arch-commits] Commit in gitlab-gitaly/repos/community-x86_64 (5 files)
Sven-Hendrik Haase
svenstaro at archlinux.org
Tue Apr 3 16:24:41 UTC 2018
Date: Tuesday, April 3, 2018 @ 16:24:39
Author: svenstaro
Revision: 313982
archrelease: copy trunk to community-x86_64
Added:
gitlab-gitaly/repos/community-x86_64/PKGBUILD
(from rev 313981, gitlab-gitaly/trunk/PKGBUILD)
gitlab-gitaly/repos/community-x86_64/gitlab-gitaly.service
(from rev 313981, gitlab-gitaly/trunk/gitlab-gitaly.service)
Deleted:
gitlab-gitaly/repos/community-x86_64/90cbe1dcdbd7439de7475394f8f20890ce68081b.patch
gitlab-gitaly/repos/community-x86_64/PKGBUILD
gitlab-gitaly/repos/community-x86_64/gitlab-gitaly.service
------------------------------------------------+
90cbe1dcdbd7439de7475394f8f20890ce68081b.patch | 25 ----
PKGBUILD | 126 +++++++++++------------
gitlab-gitaly.service | 50 ++++-----
3 files changed, 86 insertions(+), 115 deletions(-)
Deleted: 90cbe1dcdbd7439de7475394f8f20890ce68081b.patch
===================================================================
--- 90cbe1dcdbd7439de7475394f8f20890ce68081b.patch 2018-04-03 16:24:21 UTC (rev 313981)
+++ 90cbe1dcdbd7439de7475394f8f20890ce68081b.patch 2018-04-03 16:24:39 UTC (rev 313982)
@@ -1,25 +0,0 @@
-From 90cbe1dcdbd7439de7475394f8f20890ce68081b Mon Sep 17 00:00:00 2001
-From: Matija Čupić <matteeyah at gmail.com>
-Date: Fri, 30 Mar 2018 18:23:07 +0200
-Subject: [PATCH] Bump charlock_holmes
-
----
- ruby/Gemfile.lock | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock
-index 2b5287b..91efe4f 100644
---- a/ruby/Gemfile.lock
-+++ b/ruby/Gemfile.lock
-@@ -9,7 +9,7 @@ GEM
- addressable (2.5.2)
- public_suffix (>= 2.0.2, < 4.0)
- ast (2.3.0)
-- charlock_holmes (0.7.5)
-+ charlock_holmes (0.7.6)
- concurrent-ruby (1.0.5)
- diff-lcs (1.3)
- escape_utils (1.1.1)
---
-libgit2 0.26.0
-
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-04-03 16:24:21 UTC (rev 313981)
+++ PKGBUILD 2018-04-03 16:24:39 UTC (rev 313982)
@@ -1,65 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-
-pkgname=gitlab-gitaly
-pkgver=0.92.0
-pkgrel=2
-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)
-options=(!buildflags)
-makedepends=(go ruby2.3-bundler cmake)
-backup=("etc/gitlab-gitaly/config.toml")
-source=("${pkgname}-${pkgver}.tar.gz::https://gitlab.com/gitlab-org/gitaly/repository/archive.tar.gz?ref=v${pkgver}"
- "gitlab-gitaly.service"
- 90cbe1dcdbd7439de7475394f8f20890ce68081b.patch)
-sha512sums=('29cf0adf944f4f3d5c7fc41ac4c89f97b7a8a07562bd19a80ba5aeffd7e3b66d75a2130e6191c423bd3a96b5f5bbb614916509100576e9927e4afba7470f4b1b'
- 'b330c0f42592322ad2131079ca554a13a364007182dded8c556198caff2c9ec642acf5bb7dfecb05de5a3d89bffec6588b6d05c8c7c5c771a46df3d296deed28'
- 'cad360f504b028468060474e7a8d68081f19aa9b5d95bf63206e64ad0484767f07af3298b63c12b5d4281ac775a30afe153531634a0f66bbc625c54e0cbfa273')
-
-_homedir="/var/lib/gitlab"
-
-prepare() {
- cd "gitaly-v${pkgver}-"*
-
- patch -Np1 -i "${srcdir}"/90cbe1dcdbd7439de7475394f8f20890ce68081b.patch
-
- sed -i "s/bundle install/bundle-2.3 install/" Makefile
- sed -i "s/bundle config/bundle-2.3 config/" 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/\"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
-}
-
-build() {
- cd "gitaly-v${pkgver}-"*
-
- make build
-}
-
-package() {
- cd "gitaly-v${pkgver}-"*
-
- make PREFIX=/usr DESTDIR=${pkgdir} install
- mkdir -p "${pkgdir}/etc/${pkgname}"
- sed \
- -e "s|^socket_path =.*|socket_path = \"${_homedir}/sockets/gitlab-gitaly.socket\"|" \
- -e "s|^path =.*|path = \"${_homedir}/repositories\"|" \
- config.toml.example > "${pkgdir}/etc/${pkgname}/config.toml"
-
- mkdir -p ${pkgdir}/usr/share/webapps/gitlab-gitaly
- cp -r ruby ${pkgdir}/usr/share/webapps/gitlab-gitaly/ruby
-
- install -Dm644 config.toml.example "${pkgdir}/usr/share/${pkgname}/config.toml.example"
- install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- install -Dm0644 "${srcdir}/gitlab-gitaly.service" "${pkgdir}/usr/lib/systemd/system/gitlab-gitaly.service"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: gitlab-gitaly/repos/community-x86_64/PKGBUILD (from rev 313981, gitlab-gitaly/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-04-03 16:24:39 UTC (rev 313982)
@@ -0,0 +1,61 @@
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+
+pkgname=gitlab-gitaly
+pkgver=0.93.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)
+options=(!buildflags)
+makedepends=(go ruby2.3-bundler cmake)
+backup=("etc/gitlab-gitaly/config.toml")
+source=("${pkgname}-${pkgver}.tar.gz::https://gitlab.com/gitlab-org/gitaly/repository/archive.tar.gz?ref=v${pkgver}"
+ "gitlab-gitaly.service")
+sha512sums=('046db8eeb6243e4a32a7497240e8b17c6e01b61d5aadf073b1dd0e388035b21cce3b06fd38ccf86a5ebde5ee544f98b8f564ba0aaf371a04a396d9c9a662eafc'
+ 'b330c0f42592322ad2131079ca554a13a364007182dded8c556198caff2c9ec642acf5bb7dfecb05de5a3d89bffec6588b6d05c8c7c5c771a46df3d296deed28')
+
+_homedir="/var/lib/gitlab"
+
+prepare() {
+ cd "gitaly-v${pkgver}-"*
+
+ sed -i "s/bundle install/bundle-2.3 install/" Makefile
+ sed -i "s/bundle config/bundle-2.3 config/" 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/\"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
+}
+
+build() {
+ cd "gitaly-v${pkgver}-"*
+
+ make build
+}
+
+package() {
+ cd "gitaly-v${pkgver}-"*
+
+ make PREFIX=/usr DESTDIR=${pkgdir} install
+ mkdir -p "${pkgdir}/etc/${pkgname}"
+ sed \
+ -e "s|^socket_path =.*|socket_path = \"${_homedir}/sockets/gitlab-gitaly.socket\"|" \
+ -e "s|^path =.*|path = \"${_homedir}/repositories\"|" \
+ config.toml.example > "${pkgdir}/etc/${pkgname}/config.toml"
+
+ mkdir -p ${pkgdir}/usr/share/webapps/gitlab-gitaly
+ cp -r ruby ${pkgdir}/usr/share/webapps/gitlab-gitaly/ruby
+
+ install -Dm644 config.toml.example "${pkgdir}/usr/share/${pkgname}/config.toml.example"
+ install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ install -Dm0644 "${srcdir}/gitlab-gitaly.service" "${pkgdir}/usr/lib/systemd/system/gitlab-gitaly.service"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: gitlab-gitaly.service
===================================================================
--- gitlab-gitaly.service 2018-04-03 16:24:21 UTC (rev 313981)
+++ gitlab-gitaly.service 2018-04-03 16:24:39 UTC (rev 313982)
@@ -1,25 +0,0 @@
-#####################################################
-#
-# GitLab version : 9.x
-# Contributors : axil
-# Downloaded from : https://gitlab.com/gitlab-org/gitlab-recipes/tree/master/init/systemd
-#
-####################################################
-
-[Unit]
-Description=Gitaly is a Git RPC service for handling all the git calls made by GitLab.
-Requires=gitlab-unicorn.service
-Wants=gitlab-unicorn.service
-After=gitlab-unicorn.service
-
-[Service]
-Type=simple
-User=gitlab
-Group=gitlab
-WorkingDirectory=/usr/share/webapps/gitlab
-SyslogIdentifier=gitlab-gitaly
-PIDFile=/run/gitlab/gitaly.pid
-ExecStart=/usr/bin/gitaly /etc/gitlab-gitaly/config.toml
-
-[Install]
-WantedBy=multi-user.target
Copied: gitlab-gitaly/repos/community-x86_64/gitlab-gitaly.service (from rev 313981, gitlab-gitaly/trunk/gitlab-gitaly.service)
===================================================================
--- gitlab-gitaly.service (rev 0)
+++ gitlab-gitaly.service 2018-04-03 16:24:39 UTC (rev 313982)
@@ -0,0 +1,25 @@
+#####################################################
+#
+# GitLab version : 9.x
+# Contributors : axil
+# Downloaded from : https://gitlab.com/gitlab-org/gitlab-recipes/tree/master/init/systemd
+#
+####################################################
+
+[Unit]
+Description=Gitaly is a Git RPC service for handling all the git calls made by GitLab.
+Requires=gitlab-unicorn.service
+Wants=gitlab-unicorn.service
+After=gitlab-unicorn.service
+
+[Service]
+Type=simple
+User=gitlab
+Group=gitlab
+WorkingDirectory=/usr/share/webapps/gitlab
+SyslogIdentifier=gitlab-gitaly
+PIDFile=/run/gitlab/gitaly.pid
+ExecStart=/usr/bin/gitaly /etc/gitlab-gitaly/config.toml
+
+[Install]
+WantedBy=multi-user.target
More information about the arch-commits
mailing list