Date: Monday, December 5, 2022 @ 16:58:01
Author: anatolik
Revision: 1356599
upgpkg: gitlab-gitaly 15.6.1-1
Modified:
gitlab-gitaly/trunk/PKGBUILD
gitlab-gitaly/trunk/configs.patch
gitlab-gitaly/trunk/ruby27.patch
---------------+
PKGBUILD | 16 ++++++++++------
configs.patch | 2 +-
ruby27.patch | 54 ++++++++++++++++++++++++++----------------------------
3 files changed, 37 insertions(+), 35 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-12-05 16:55:29 UTC (rev 1356598)
+++ PKGBUILD 2022-12-05 16:58:01 UTC (rev 1356599)
@@ -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.5.1
-pkgrel=2
+pkgver=15.6.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=('66b82c9510f9012d2fd2968bfe710a6af89ef5c2025d9af073e6ae21f72a4c588da724e84eb4494b963ecf2014788991b8e5640051ce19c1fb2760bd4f2505e7'
-
'17a8080eaaef88c53bbe84836a2fa861cf04239346e44bb77d6a4b1c9255b5fefcc3413a23cf7c8156c9189f2825b4bd6e72c98439cf3facceb11748b669185a'
+sha512sums=('4db66e5f96264c2566ba96ffa40051df5bbcbbdc04ae0ac1a3b05b6f7e31cb4966203afd65932777a2c2e57e689e9064357fc637ac3d8f8f8b3237044c56e1a0'
+
'ba4343e1646e301e038d50e89509ec6fe376628506374489eb63f7ea36a1eec36ca073f69abd883bbca8079294a5bfaacea4bab2abf8a3044b79304ee09a69df'
'7f5cd528c873a5e43e18aa6a88bd7298422c047e0e61cf3208be7d9fcfdfdc8a844b5c439ab6afc2098c5c4c60ed9c3d167c2f87517f1e93b34f39be3d3dad09'
-
'1174330f4e8145e47da0aeac13f9afc579c4e084e9c3149da928d1674d5b4fb9ceb6286271ae003e4ddd723eec52a657261ce9fee4ba128a445ec4bc94d4bdde')
+
'd852c1ca4a1c289be3636fdb6405b4a0c63d88cbc15acb8e0cb9280c4563d4e862f5ab666e34ce6550d2b5c323919f8d4b53d7c58efa2834774b9cce2e3f229e')
prepare() {
cd gitaly-$_tag
@@ -39,8 +39,12 @@
build() {
cd gitaly-$_tag
+ pushd ruby
bundle-2.7 config force_ruby_platform true # build from sources as some
prebuilt gems are not available for newer ruby
- make BUILD_TAGS="tracer_static tracer_static_jaeger"
+ bundle-2.7 install --path vendor/bundle
+ popd
+
+ make V=1 BUILD_TAGS="tracer_static tracer_static_jaeger"
}
package() {
Modified: configs.patch
===================================================================
--- configs.patch 2022-12-05 16:55:29 UTC (rev 1356598)
+++ configs.patch 2022-12-05 16:58:01 UTC (rev 1356599)
@@ -1,4 +1,4 @@
-commit 9aef34b89229e115ebf7a8e86f2370e9b1a3f1e4
+commit dd7533a33c4e7eb93abdc5d50e3c03e29f54021e
Author: Anatol Pomozov <[email protected]>
Date: Tue Jun 21 09:35:40 2022 -0700
Modified: ruby27.patch
===================================================================
--- ruby27.patch 2022-12-05 16:55:29 UTC (rev 1356598)
+++ ruby27.patch 2022-12-05 16:58:01 UTC (rev 1356599)
@@ -1,4 +1,4 @@
-commit c81c474a51c7b8137f31603dd7746b755817a3f7
+commit 8fd2fa1b0c02fda6f2f5f3df96092922ba55f5da
Author: Anatol Pomozov <[email protected]>
Date: Tue Jun 21 09:37:26 2022 -0700
@@ -5,56 +5,41 @@
Pin sources to ruby2.7 package
diff --git a/Makefile b/Makefile
-index 414c9c043..75eed0a9d 100644
+index e80ab5d72..5d3cd312c 100644
--- a/Makefile
+++ b/Makefile
@@ -402,7 +402,7 @@ race-go: test-go
.PHONY: rspec
## Run Ruby tests.
- rspec: prepare-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
- # This is a workaround for our unprivileged CI builds. We manually execute the
- # build target as privileged user, but then run other targets unprivileged.
-@@ -463,7 +463,7 @@ clean-ruby-vendor-go:
+ .PHONY: verify
+ ## Verify that various files conform to our expectations.
+@@ -460,7 +460,7 @@ clean-ruby-vendor-go:
.PHONY: rubocop
## Run Rubocop.
- rubocop: ${SOURCE_DIR}/.ruby-bundle
+ 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.
-@@ -539,7 +539,9 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a
+@@ -542,7 +542,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.
- ${SOURCE_DIR}/.ruby-bundle: ${GITALY_RUBY_DIR}/Gemfile.lock
${GITALY_RUBY_DIR}/Gemfile
+ ${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 config set --local deployment
"true"
-+ ${Q}cd ${GITALY_RUBY_DIR} && bundle-2.7 config # for debugging
+ ${Q}cd ${GITALY_RUBY_DIR} && bundle-2.7 install
${Q}touch $@
${SOURCE_DIR}/NOTICE: ${BUILD_DIR}/NOTICE
-diff --git a/_support/generate-proto-ruby b/_support/generate-proto-ruby
-index 6ddb15cbb..bf4bc51f0 100755
---- a/_support/generate-proto-ruby
-+++ b/_support/generate-proto-ruby
-@@ -20,7 +20,7 @@ def main
- # locations. `protoc` requires this.
- proto_include_abs = File.absolute_path(File.join('..', PROTO_INCLUDE))
-
-- run!(%W[bundle exec grpc_tools_ruby_protoc -I #{proto_include_abs}
--ruby_out=../#{ruby_lib_gitaly} --grpc_out=../#{ruby_lib_gitaly}] +
PROTO_FILES)
-+ run!(%W[bundle-2.7 exec grpc_tools_ruby_protoc -I #{proto_include_abs}
--ruby_out=../#{ruby_lib_gitaly} --grpc_out=../#{ruby_lib_gitaly}] +
PROTO_FILES)
- end
-
- write_ruby_requires
diff --git a/internal/gitaly/linguist/linguist.go
b/internal/gitaly/linguist/linguist.go
-index f5f11b067..550a07eb5 100644
+index 30ba2d612..702b7c777 100644
--- a/internal/gitaly/linguist/linguist.go
+++ b/internal/gitaly/linguist/linguist.go
-@@ -87,7 +87,7 @@ func (inst *Instance) startGitLinguist(ctx context.Context,
commitID string) (*c
+@@ -86,7 +86,7 @@ func (inst *Instance) startGitLinguist(ctx context.Context,
commitID string) (*c
return nil, fmt.Errorf("get repo path: %w", err)
}
@@ -64,7 +49,7 @@
return nil, fmt.Errorf("finding bundle executable: %w", err)
}
diff --git a/internal/gitaly/rubyserver/rubyserver.go
b/internal/gitaly/rubyserver/rubyserver.go
-index 76c901a84..c2679d45e 100644
+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 {
@@ -77,7 +62,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 7ec113674..1fb233dc7 100755
+index 11cfa231b..d7493f723 100755
--- a/ruby/bin/gitaly-ruby
+++ b/ruby/bin/gitaly-ruby
@@ -1,4 +1,4 @@
@@ -96,3 +81,16 @@
# 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
+--- a/tools/protogem/build-proto-gem
++++ b/tools/protogem/build-proto-gem
+@@ -41,7 +41,7 @@ def generate_sources(output_dir, version)
+ proto_files = Dir[File.join(proto_dir, '*.proto')].sort
+
+ run!(
+- %W[bundle exec grpc_tools_ruby_protoc -I #{proto_dir}
--ruby_out=#{proto_output_dir} --grpc_out=#{proto_output_dir}] + proto_files,
++ %W[bundle-2.7 exec grpc_tools_ruby_protoc -I #{proto_dir}
--ruby_out=#{proto_output_dir} --grpc_out=#{proto_output_dir}] + proto_files,
+ File.join(SOURCE_DIR, 'tools', 'protogem')
+ )
+
