[arch-commits] Commit in gitlab-gitaly/trunk (PKGBUILD configs.patch ruby27.patch)

Anatol Pomozov anatolik at archlinux.org
Mon Jun 21 18:36:44 UTC 2021 

    Date: Monday, June 21, 2021 @ 18:36:44
  Author: anatolik
Revision: 966561

upgpkg: gitlab-gitaly 14.0.0-1

Modified:
  gitlab-gitaly/trunk/PKGBUILD
  gitlab-gitaly/trunk/configs.patch
  gitlab-gitaly/trunk/ruby27.patch

---------------+
 PKGBUILD      |    8 ++++----
 configs.patch |   12 ++++++------
 ruby27.patch  |   16 ++++++++--------
 3 files changed, 18 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-21 18:35:14 UTC (rev 966560)
+++ PKGBUILD	2021-06-21 18:36:44 UTC (rev 966561)
@@ -4,7 +4,7 @@
 # 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=13.12.4
+pkgver=14.0.0
 pkgrel=1
 pkgdesc="Speed up Git access using caching"
 arch=('x86_64')
@@ -19,10 +19,10 @@
         "configs.patch"
         "gitlab-gitaly.service"
 	"ruby27.patch")
-sha512sums=('f11adaa3de7d63f14baf4283c162992fd46ae0e010896eabd5689100816bd08ef170505aa103b07b66df6e8a2551058f0ecbbf0f6130febcc8f0132ead3b87d0'
-            'af17be897a567356f99388a2d16888cc90c13a2587553ca4893736bdd0b5078abaccb476971c30267ad24e5909bf150d2a8e9e300fa93d130ef7eabafecaa3e8'
+sha512sums=('ec889888842f4438909472f1209b63505c06b3ad16effdd05b76fba27cd78f94bbc5c87396dcc0b1a5e5a0850bb8f89813c55a8685b15c8f29218a3b20c1c217'
+            '872a6c065113c2415cdbd5a2107501fc849b7e291042ac435b04359c69e78b58e93b294de85bcf910d7e4d64dcfb40902b35e392f61499e9b61ebecc842a4b73'
             '7f5cd528c873a5e43e18aa6a88bd7298422c047e0e61cf3208be7d9fcfdfdc8a844b5c439ab6afc2098c5c4c60ed9c3d167c2f87517f1e93b34f39be3d3dad09'
-            '45c51ab13ed5ebb0c4ebef52eab5aac27c58a0978fcc1b2bff3032f11fcecd65c7ff3bd0f7290d8e49b6a6454e4e4f71175303ef793b6d9351fd78af5a80b65c')
+            '8b3bfb5781c865c82dd39170bb56c5dba4e9eabc669f0a59bf74f8eda0cb5c82c629b44a719f9ff9038f28bbb5df9db5a73d898f64b7f441ce87626adf512103')
 
 prepare() {
   cd gitaly-$_tag

Modified: configs.patch
===================================================================
--- configs.patch	2021-06-21 18:35:14 UTC (rev 966560)
+++ configs.patch	2021-06-21 18:36:44 UTC (rev 966561)
@@ -1,4 +1,4 @@
-commit d1de94c53873750186ace0740f833e50ed1fda25
+commit 7c74563bdb785dc7c87a35475ecc61d02a8a5826
 Author: Anatol Pomozov <anatol.pomozov at gmail.com>
 Date:   Tue May 26 00:26:02 2020 -0700
 
@@ -15,7 +15,7 @@
     will cause a conflict that needs to be reviewed manually.
 
 diff --git a/config.toml.example b/config.toml.example
-index 223e91d4e..0e483e8b9 100644
+index eaa23fd8e..0e483e8b9 100644
 --- a/config.toml.example
 +++ b/config.toml.example
 @@ -2,10 +2,10 @@
@@ -26,12 +26,12 @@
 +socket_path = "/run/gitlab/gitlab-gitaly.socket"
  
  # The directory where Gitaly's executables are stored
--bin_dir = "/home/git/gitaly"
+-bin_dir = "/home/git/gitaly/_build/bin"
 +bin_dir = "/usr/bin"
  
  # # Optional: listen on a TCP socket. This is insecure (no authentication)
  # listen_addr = "localhost:9999"
-@@ -17,7 +17,7 @@ bin_dir = "/home/git/gitaly"
+@@ -17,7 +17,7 @@ bin_dir = "/home/git/gitaly/_build/bin"
  # # Optional: configure where the Gitaly creates the sockets for internal connections. If unset, Gitaly will create a randomly
  # # named temp directory each time it boots.
  # # Non Gitaly clients should never connect to these sockets.
@@ -40,7 +40,7 @@
  
  # # Optional: authenticate Gitaly requests using a shared secret
  # [auth]
-@@ -25,8 +25,8 @@ bin_dir = "/home/git/gitaly"
+@@ -25,8 +25,8 @@ bin_dir = "/home/git/gitaly/_build/bin"
  # transitioning = false # Set `transitioning` to true to temporarily allow unauthenticated while rolling out authentication.
  
  # [tls]
@@ -51,7 +51,7 @@
  
  # # Git settings
  # [git]
-@@ -38,7 +38,7 @@ bin_dir = "/home/git/gitaly"
+@@ -38,7 +38,7 @@ bin_dir = "/home/git/gitaly/_build/bin"
  
  [[storage]]
  name = "default"

Modified: ruby27.patch
===================================================================
--- ruby27.patch	2021-06-21 18:35:14 UTC (rev 966560)
+++ ruby27.patch	2021-06-21 18:36:44 UTC (rev 966561)
@@ -1,4 +1,4 @@
-commit ae1ced361ddcf53284c42519d8aa0665bba513be
+commit 939e0390baecae6c4d4283c58c48921857ae8183
 Author: Anatol Pomozov <anatol.pomozov at gmail.com>
 Date:   Mon Mar 22 18:23:32 2021 -0700
 
@@ -5,10 +5,10 @@
     Pin sources to ruby2.7 package
 
 diff --git a/Makefile b/Makefile
-index 94f15526c..524c3b883 100644
+index 1d636216c..5ee9fd24f 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -236,7 +236,7 @@ race-go: test-go
+@@ -253,7 +253,7 @@ race-go: test-go
  
  .PHONY: rspec
  rspec: build prepare-tests
@@ -17,7 +17,7 @@
  
  .PHONY: verify
  verify: check-mod-tidy check-formatting notice-up-to-date check-proto rubocop
-@@ -286,7 +286,7 @@ check-proto: proto no-proto-changes lint-proto
+@@ -303,7 +303,7 @@ check-proto: proto no-proto-changes lint-proto
  
  .PHONY: rubocop
  rubocop: ${SOURCE_DIR}/.ruby-bundle
@@ -26,7 +26,7 @@
  
  .PHONY: cover
  cover: GO_BUILD_TAGS := ${GO_BUILD_TAGS},postgres
-@@ -344,9 +344,9 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a
+@@ -370,9 +370,9 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a
  # step. Both Omnibus and CNG assume it is in the Gitaly root, not in
  # _build. Hence the '../' in front.
  ${SOURCE_DIR}/.ruby-bundle: ${GITALY_RUBY_DIR}/Gemfile.lock ${GITALY_RUBY_DIR}/Gemfile
@@ -53,7 +53,7 @@
  
    write_ruby_requires
 diff --git a/internal/gitaly/linguist/linguist.go b/internal/gitaly/linguist/linguist.go
-index 8cb187569..5bc8975ef 100644
+index 42218e32a..c0652292a 100644
 --- a/internal/gitaly/linguist/linguist.go
 +++ b/internal/gitaly/linguist/linguist.go
 @@ -81,7 +81,7 @@ func (inst *Instance) Color(language string) string {
@@ -75,10 +75,10 @@
  
  	// We have learned that in practice the command we are about to run is a
 diff --git a/internal/gitaly/rubyserver/rubyserver.go b/internal/gitaly/rubyserver/rubyserver.go
-index 237b01c42..2dc8743e7 100644
+index 6292d1d66..0244056ee 100644
 --- a/internal/gitaly/rubyserver/rubyserver.go
 +++ b/internal/gitaly/rubyserver/rubyserver.go
-@@ -123,7 +123,7 @@ func (s *Server) start() error {
+@@ -129,7 +129,7 @@ func (s *Server) start() error {
  		// Use 'ruby-cd' to make sure gitaly-ruby has the same working directory
  		// as the current process. This is a hack to sort-of support relative
  		// Unix socket paths.

More information about the arch-commits mailing list