[arch-commits] Commit in gitlab-gitaly/repos/community-x86_64 (4 files)

Sven-Hendrik Haase svenstaro at archlinux.org
Mon May 13 17:19:51 UTC 2019


    Date: Monday, May 13, 2019 @ 17:19:51
  Author: svenstaro
Revision: 467155

archrelease: copy trunk to community-x86_64

Added:
  gitlab-gitaly/repos/community-x86_64/PKGBUILD
    (from rev 467154, gitlab-gitaly/trunk/PKGBUILD)
  gitlab-gitaly/repos/community-x86_64/gitlab-gitaly.service
    (from rev 467154, gitlab-gitaly/trunk/gitlab-gitaly.service)
Deleted:
  gitlab-gitaly/repos/community-x86_64/PKGBUILD
  gitlab-gitaly/repos/community-x86_64/gitlab-gitaly.service

-----------------------+
 PKGBUILD              |  145 +++++++++++++++++++++++++-----------------------
 gitlab-gitaly.service |   50 ++++++++--------
 2 files changed, 101 insertions(+), 94 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-05-13 17:19:43 UTC (rev 467154)
+++ PKGBUILD	2019-05-13 17:19:51 UTC (rev 467155)
@@ -1,69 +0,0 @@
-# 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.35.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.5 libxml2 libxslt)
-options=(!buildflags)
-makedepends=(go ruby2.5-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=('7ab30ad029074a50f71ea56ed9569e7708a343fb14c8c315238e10ff8801f25da78d866b035374b9a46e70dc35d1a8b5d97dd6077feb177b7df7b226d2a3223f'
-            'b330c0f42592322ad2131079ca554a13a364007182dded8c556198caff2c9ec642acf5bb7dfecb05de5a3d89bffec6588b6d05c8c7c5c771a46df3d296deed28')
-
-_homedir="/var/lib/gitlab"
-
-prepare() {
-  cd "gitaly-"*
-
-  sed -i "s/bundle install/bundle-2.5 install/" Makefile
-  sed -i "s/bundle config/bundle-2.5 config/" Makefile
-  sed -i "s/bundle show/bundle-2.5 show/" Makefile
-  sed -i "s/bundle/bundle-2.5/" internal/rubyserver/rubyserver.go
-  sed -i "s/bundle/bundle-2.5/" internal/linguist/linguist.go
-  sed -i "s/bundle/bundle-2.5/" _support/makegen.go
-  sed -i "s/\"ruby\"/\"ruby-2.5\"/" internal/linguist/linguist.go
-  sed -i "s/env ruby/env ruby-2.5/" ruby/bin/gitaly-ruby
-  sed -i "s/env ruby/env ruby-2.5/" ruby/bin/ruby-cd
-  sed -i "s/VERSION = .*/VERSION = ${pkgver}/" Makefile
-  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
-
-  # https://github.com/bundler/bundler/issues/6882
-  sed -e '/BUNDLED WITH/,+1d' -i ruby/Gemfile.lock
-}
-
-build() {
-  cd "gitaly-"*
-
-  make build
-}
-
-package() {
-  cd "gitaly-"*
-
-  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 467154, gitlab-gitaly/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-05-13 17:19:51 UTC (rev 467155)
@@ -0,0 +1,76 @@
+# 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.42.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.5 libxml2 libxslt)
+options=(!buildflags)
+makedepends=(go ruby2.5-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=('fc5e5d6ffe3de1f92f0a3de443521c9b876823e6b4f12a556776760055015addf81c89eebfec046fc28d45b1b22a76bd8e75d9f6c8383972f59ea62e65076686'
+            'b330c0f42592322ad2131079ca554a13a364007182dded8c556198caff2c9ec642acf5bb7dfecb05de5a3d89bffec6588b6d05c8c7c5c771a46df3d296deed28')
+
+_homedir="/var/lib/gitlab"
+
+prepare() {
+  cd "gitaly-"*
+
+  sed -i "s/bundle install/bundle-2.5 install/" Makefile
+  sed -i "s/bundle config/bundle-2.5 config/" Makefile
+  sed -i "s/bundle show/bundle-2.5 show/" Makefile
+  sed -i "s/bundle/bundle-2.5/" \
+    internal/rubyserver/rubyserver.go \
+    internal/linguist/linguist.go \
+    _support/makegen.go
+  sed -i "s/env ruby/env ruby-2.5/g" \
+    ruby/gitlab-shell/bin/test-logger \
+    ruby/gitlab-shell/bin/check \
+    ruby/gitlab-shell/hooks/post-receive \
+    ruby/gitlab-shell/hooks/update \
+    ruby/gitlab-shell/hooks/pre-receive
+  sed -i "s/\"ruby\"/\"ruby-2.5\"/" internal/linguist/linguist.go
+  sed -i "s/env ruby/env ruby-2.5/" ruby/bin/gitaly-ruby
+  sed -i "s/env ruby/env ruby-2.5/" ruby/bin/ruby-cd
+  sed -i "s/VERSION = .*/VERSION = ${pkgver}/" Makefile
+  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
+
+  # https://github.com/bundler/bundler/issues/6882
+  sed -e '/BUNDLED WITH/,+1d' -i ruby/Gemfile.lock
+}
+
+build() {
+  cd "gitaly-"*
+
+  make build
+}
+
+package() {
+  cd "gitaly-"*
+
+  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	2019-05-13 17:19:43 UTC (rev 467154)
+++ gitlab-gitaly.service	2019-05-13 17:19:51 UTC (rev 467155)
@@ -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 467154, gitlab-gitaly/trunk/gitlab-gitaly.service)
===================================================================
--- gitlab-gitaly.service	                        (rev 0)
+++ gitlab-gitaly.service	2019-05-13 17:19:51 UTC (rev 467155)
@@ -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