Date: Tuesday, October 25, 2022 @ 18:05:34
Author: anatolik
Revision: 1334810
upgpkg: gitlab-gitaly 15.5.1-1
Modified:
gitlab-gitaly/trunk/PKGBUILD
gitlab-gitaly/trunk/ruby27.patch
--------------+
PKGBUILD | 8 ++++----
ruby27.patch | 35 +++++++++++++----------------------
2 files changed, 17 insertions(+), 26 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-10-25 17:54:38 UTC (rev 1334809)
+++ PKGBUILD 2022-10-25 18:05:34 UTC (rev 1334810)
@@ -4,8 +4,8 @@
# 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.4.0
-pkgrel=2
+pkgver=15.5.1
+pkgrel=1
pkgdesc="Speed up Git access using caching"
arch=('x86_64')
url="https://gitlab.com/gitlab-org/gitaly";
@@ -19,10 +19,10 @@
"configs.patch"
"gitlab-gitaly.service"
"ruby27.patch")
-sha512sums=('4d9e9b2f0aaf9d582e9a815590de389e1341e862d1ffa754f2e55416394d616eb5316288c7e5e43c3500803ac0ef155f2933124d873e0282ff832313f2f365d1'
+sha512sums=('66b82c9510f9012d2fd2968bfe710a6af89ef5c2025d9af073e6ae21f72a4c588da724e84eb4494b963ecf2014788991b8e5640051ce19c1fb2760bd4f2505e7'
'17a8080eaaef88c53bbe84836a2fa861cf04239346e44bb77d6a4b1c9255b5fefcc3413a23cf7c8156c9189f2825b4bd6e72c98439cf3facceb11748b669185a'
'7f5cd528c873a5e43e18aa6a88bd7298422c047e0e61cf3208be7d9fcfdfdc8a844b5c439ab6afc2098c5c4c60ed9c3d167c2f87517f1e93b34f39be3d3dad09'
-
'3fcd67cc574d30adda3ac0f0bb0e665b2ed41ae6364bcffb6faf208008cf4ceac2477619d943d251fadf00ff4720967da29297ad925b9efdf95000e1f88ced61')
+
'1174330f4e8145e47da0aeac13f9afc579c4e084e9c3149da928d1674d5b4fb9ceb6286271ae003e4ddd723eec52a657261ce9fee4ba128a445ec4bc94d4bdde')
prepare() {
cd gitaly-$_tag
Modified: ruby27.patch
===================================================================
--- ruby27.patch 2022-10-25 17:54:38 UTC (rev 1334809)
+++ ruby27.patch 2022-10-25 18:05:34 UTC (rev 1334810)
@@ -1,4 +1,4 @@
-commit 97a8954f6d7764a0f010875093395d42578e309f
+commit c81c474a51c7b8137f31603dd7746b755817a3f7
Author: Anatol Pomozov <[email protected]>
Date: Tue Jun 21 09:37:26 2022 -0700
@@ -5,10 +5,10 @@
Pin sources to ruby2.7 package
diff --git a/Makefile b/Makefile
-index 117498e19..74e3254ec 100644
+index 414c9c043..75eed0a9d 100644
--- a/Makefile
+++ b/Makefile
-@@ -374,7 +374,7 @@ race-go: test-go
+@@ -402,7 +402,7 @@ race-go: test-go
.PHONY: rspec
## Run Ruby tests.
rspec: prepare-tests
@@ -16,8 +16,8 @@
+ ${Q}cd ${GITALY_RUBY_DIR} &&
PATH='${SOURCE_DIR}/internal/testhelper/testdata/home/bin:${PATH}' bundle-2.7
exec rspec
# This is a workaround for our unprivileged CI builds. We manually execute the
- # build target as privileged user, but then run the rspec target unprivileged.
-@@ -425,7 +425,7 @@ clean-ruby-vendor-go:
+ # build target as privileged user, but then run other targets unprivileged.
+@@ -463,7 +463,7 @@ clean-ruby-vendor-go:
.PHONY: rubocop
## Run Rubocop.
rubocop: ${SOURCE_DIR}/.ruby-bundle
@@ -26,7 +26,7 @@
.PHONY: cover
## Generate coverage report via Go tests.
-@@ -497,7 +497,9 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a
+@@ -539,7 +539,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
@@ -51,32 +51,23 @@
write_ruby_requires
diff --git a/internal/gitaly/linguist/linguist.go
b/internal/gitaly/linguist/linguist.go
-index 4ac9abfd2..29b6add09 100644
+index f5f11b067..550a07eb5 100644
--- a/internal/gitaly/linguist/linguist.go
+++ b/internal/gitaly/linguist/linguist.go
-@@ -87,7 +87,7 @@ func (inst *Instance) Color(language string) string {
- }
+@@ -87,7 +87,7 @@ func (inst *Instance) startGitLinguist(ctx context.Context,
commitID string) (*c
+ return nil, fmt.Errorf("get repo path: %w", err)
+ }
- func (inst *Instance) startGitLinguist(ctx context.Context, repoPath string,
commitID string) (*command.Command, error) {
- bundle, err := exec.LookPath("bundle")
+ bundle, err := exec.LookPath("bundle-2.7")
if err != nil {
return nil, fmt.Errorf("finding bundle executable: %w", err)
}
-@@ -127,7 +127,7 @@ func openLanguagesJSON(cfg config.Cfg) (io.ReadCloser,
error) {
- // We use a symlink because we cannot trust Bundler to not print garbage
- // on its stdout.
- rubyScript :=
`FileUtils.ln_sf(Bundler.rubygems.find_name('github-linguist').first.full_gem_path,
ARGV.first)`
-- cmd := exec.Command("bundle", "exec", "ruby", "-rfileutils", "-e",
rubyScript, linguistPathSymlink.Name())
-+ cmd := exec.Command("bundle-2.7", "exec", "ruby-2.7", "-rfileutils",
"-e", rubyScript, linguistPathSymlink.Name())
- cmd.Dir = cfg.Ruby.Dir
-
- // 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 5ac213e72..5d71ddeed 100644
+index 76c901a84..c2679d45e 100644
--- a/internal/gitaly/rubyserver/rubyserver.go
+++ b/internal/gitaly/rubyserver/rubyserver.go
-@@ -190,7 +190,7 @@ func (s *Server) start() error {
+@@ -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.
@@ -86,7 +77,7 @@
events := make(chan supervisor.Event)
check := func() error { return ping(socketPath) }
diff --git a/ruby/bin/gitaly-ruby b/ruby/bin/gitaly-ruby
-index c0f17b1e5..31121e12e 100755
+index 7ec113674..1fb233dc7 100755
--- a/ruby/bin/gitaly-ruby
+++ b/ruby/bin/gitaly-ruby
@@ -1,4 +1,4 @@
