Date: Sunday, April 23, 2023 @ 18:49:03
Author: anatolik
Revision: 1448423
upgpkg: gitlab-gitaly 15.11.0-1
Modified:
gitlab-gitaly/trunk/PKGBUILD
gitlab-gitaly/trunk/configs.patch
gitlab-gitaly/trunk/ruby27.patch
---------------+
PKGBUILD | 8 ++++----
configs.patch | 23 ++++++++++-------------
ruby27.patch | 50 +++-----------------------------------------------
3 files changed, 17 insertions(+), 64 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2023-04-23 18:42:46 UTC (rev 1448422)
+++ PKGBUILD 2023-04-23 18:49:03 UTC (rev 1448423)
@@ -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=15.10.0
+pkgver=15.11.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=('9a4d085f1a9251457a50f2e93fbb2a6f009fc96c993b18aee6a26214259a7976625c59aa349c631436e1080db09c6edabcaea5db722ed563ca0d354fa3ba071c'
-
'ba4343e1646e301e038d50e89509ec6fe376628506374489eb63f7ea36a1eec36ca073f69abd883bbca8079294a5bfaacea4bab2abf8a3044b79304ee09a69df'
+sha512sums=('49b04cfdb3eed5cdaaa02228233a383cec12b9d716fdd3a742168714e784653579538bb40742f7db09e9ca9e9b7c23a073a116ebb86c84de46f107e1274487da'
+
'9b824a791c7f563857e99a7faad013d50eb1ca93d49089742dd7ccdfbb325c1c4a48db4dc83820fda5dfedfbd3e2b03c786c8fa0f2eb3c4b78ce3bbeefb97584'
'7f5cd528c873a5e43e18aa6a88bd7298422c047e0e61cf3208be7d9fcfdfdc8a844b5c439ab6afc2098c5c4c60ed9c3d167c2f87517f1e93b34f39be3d3dad09'
-
'efaf482c40ec74a96b324f3c2e4a4ffb5a55c3faa46fd2bead9ae5db3986d1526c92d6f2911fe2c5bf349737b345827598d598b98188c49ecc901cb935f9fcb0')
+
'2e4171e42cf7d5be91ef58e720b53159c1cdc4cb6932e9044094a99e9ee21ee8792067c0f539e11336c59748ea03291c069ff265cdaf5b4aea4b14f6d0929bd8')
prepare() {
cd gitaly-$_tag
Modified: configs.patch
===================================================================
--- configs.patch 2023-04-23 18:42:46 UTC (rev 1448422)
+++ configs.patch 2023-04-23 18:49:03 UTC (rev 1448423)
@@ -1,4 +1,4 @@
-commit dd7533a33c4e7eb93abdc5d50e3c03e29f54021e
+commit d9df4f7d9579d46205c222c3bcdacd4097514ea2
Author: Anatol Pomozov <[email protected]>
Date: Tue Jun 21 09:35:40 2022 -0700
@@ -15,10 +15,10 @@
will cause a conflict that needs to be reviewed manually.
diff --git a/config.toml.example b/config.toml.example
-index 9a4753e1e..682083d8e 100644
+index aa434f288..7878dc927 100644
--- a/config.toml.example
+++ b/config.toml.example
-@@ -2,10 +2,10 @@
+@@ -2,15 +2,15 @@
# Documentation lives at https://docs.gitlab.com/ee/administration/gitaly/ and
# https://docs.gitlab.com/ee//administration/gitaly/reference
@@ -31,6 +31,12 @@
# # Optional: The directory where Gitaly can create all files required to
# # properly operate at runtime. If not set, Gitaly will create a directory in
+ # # the global temporary directory. This directory must exist.
+-# runtime_dir = "/home/git/gitaly/run"
++# runtime_dir = "/run/gitlab/gitaly/run"
+
+ # # Optional: listen on a TCP socket. This is insecure (no authentication)
+ # listen_addr = "localhost:9999"
@@ -22,7 +22,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.
@@ -69,17 +75,8 @@
# format = "json"
# # Optional: Set log level to only log entries with that severity or above
# # One of, in order: debug, info, warn, errror, fatal, panic
-@@ -81,7 +81,7 @@ dir = "/home/git/gitlab/log"
+@@ -79,14 +79,14 @@ dir = "/home/git/gitlab/log"
- [gitaly-ruby]
- # The directory where gitaly-ruby is installed
--dir = "/home/git/gitaly/ruby"
-+dir = "/usr/share/webapps/gitlab-gitaly/ruby"
-
- # # Gitaly-ruby resident set size (RSS) that triggers a memory restart (bytes)
- # max_rss = 200000000
-@@ -101,14 +101,14 @@ dir = "/home/git/gitaly/ruby"
-
[gitlab-shell]
# The directory where gitlab-shell is installed
-dir = "/home/git/gitlab-shell"
Modified: ruby27.patch
===================================================================
--- ruby27.patch 2023-04-23 18:42:46 UTC (rev 1448422)
+++ ruby27.patch 2023-04-23 18:49:03 UTC (rev 1448423)
@@ -1,53 +1,9 @@
-commit 4f8b635c102f6c66b2aa0a87659f08ac4ee7f756
+commit 93c8397df36651110096f1bb373da8ce3b05efee
Author: Anatol Pomozov <[email protected]>
Date: Tue Jun 21 09:37:26 2022 -0700
Pin sources to ruby2.7 package
-diff --git a/Makefile b/Makefile
-index 18440fb3f..a871ae254 100644
---- a/Makefile
-+++ b/Makefile
-@@ -405,7 +405,7 @@ race-go: test-go
- .PHONY: rspec
- ## Run Ruby tests.
- rspec: build prepare-tests
-- ${Q}cd ${GITALY_RUBY_DIR} &&
PATH='${SOURCE_DIR}/internal/testhelper/testdata/home/bin:${PATH}' bundle exec
rspec
-+ ${Q}cd ${GITALY_RUBY_DIR} &&
PATH='${SOURCE_DIR}/internal/testhelper/testdata/home/bin:${PATH}' bundle-2.7
exec rspec
-
- .PHONY: verify
- ## Verify that various files conform to our expectations.
-@@ -463,7 +463,7 @@ clean-ruby-vendor-go:
- .PHONY: rubocop
- ## Run Rubocop.
- rubocop: ${RUBY_BUNDLE_FILE}
-- ${Q}cd ${GITALY_RUBY_DIR} && bundle exec rubocop --parallel --config
${GITALY_RUBY_DIR}/.rubocop.yml ${GITALY_RUBY_DIR}
${SOURCE_DIR}/_support/test-boot
-+ ${Q}cd ${GITALY_RUBY_DIR} && bundle-2.7 exec rubocop --parallel
--config ${GITALY_RUBY_DIR}/.rubocop.yml ${GITALY_RUBY_DIR}
${SOURCE_DIR}/_support/test-boot
-
- .PHONY: cover
- ## Generate coverage report via Go tests.
-@@ -545,7 +545,7 @@ 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.
- ${RUBY_BUNDLE_FILE}: ${GITALY_RUBY_DIR}/Gemfile.lock
${GITALY_RUBY_DIR}/Gemfile
-- ${Q}cd ${GITALY_RUBY_DIR} && bundle install
-+ ${Q}cd ${GITALY_RUBY_DIR} && bundle-2.7 install
- ${Q}touch $@
-
- ${SOURCE_DIR}/NOTICE: ${BUILD_DIR}/NOTICE
-diff --git a/internal/gitaly/rubyserver/rubyserver.go
b/internal/gitaly/rubyserver/rubyserver.go
-index 7e661954a..4650546ff 100644
---- a/internal/gitaly/rubyserver/rubyserver.go
-+++ b/internal/gitaly/rubyserver/rubyserver.go
-@@ -191,7 +191,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.
-- args := []string{"bundle", "exec", "bin/ruby-cd", wd,
gitalyRuby, strconv.Itoa(os.Getpid()), socketPath}
-+ args := []string{"bundle-2.7", "exec", "bin/ruby-cd", wd,
gitalyRuby, strconv.Itoa(os.Getpid()), socketPath}
-
- events := make(chan supervisor.Event)
- check := func() error { return ping(socketPath) }
diff --git a/ruby/bin/gitaly-ruby b/ruby/bin/gitaly-ruby
index 11cfa231b..d7493f723 100755
--- a/ruby/bin/gitaly-ruby
@@ -69,10 +25,10 @@
# This script lets you run `bundle exec` in one directory, and then changes
into another.
diff --git a/tools/protogem/build-proto-gem b/tools/protogem/build-proto-gem
-index ee5fc94df..6b36fafc5 100755
+index 9825719a7..fcadbdc34 100755
--- a/tools/protogem/build-proto-gem
+++ b/tools/protogem/build-proto-gem
-@@ -41,7 +41,7 @@ def generate_sources(output_dir, version)
+@@ -69,7 +69,7 @@ def generate_sources(output_dir, version)
proto_files = Dir[File.join(proto_dir, '*.proto')].sort
run!(
