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

Wed Jun 8 17:39:09 UTC 2022

Date: Wednesday, June 8, 2022 @ 17:39:07
  Author: anatolik
Revision: 1229355

upgpkg: gitlab-gitaly 15.0.2-1

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

--------------+
 PKGBUILD     |    8 ++++----
 ruby27.patch |   44 +++++++++++++++++++++-----------------------
 2 files changed, 25 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================

--- PKGBUILD	2022-06-08 17:13:01 UTC (rev 1229354)
+++ PKGBUILD	2022-06-08 17:39:07 UTC (rev 1229355)
@@ -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=14.4.5
-pkgrel=2
+pkgver=15.0.2
+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=('da34a44aaa690add27c1006324ecce7cbff7a18f24832ea1aa00a07131fb402aff9cfcbd96804fbc4eec034370cb82a4874d6b49332f4a461cf95f3e21225f18'
+sha512sums=('bbd4b3b9636523e489db32b3ebba8ffda9a31d8a1f687974ce0af614276075381d6146c8fd2f45ed2a89db9507c0bef8aad83be7e12ae7daf6aefb3d3e687ed1'
             '872a6c065113c2415cdbd5a2107501fc849b7e291042ac435b04359c69e78b58e93b294de85bcf910d7e4d64dcfb40902b35e392f61499e9b61ebecc842a4b73'
             '7f5cd528c873a5e43e18aa6a88bd7298422c047e0e61cf3208be7d9fcfdfdc8a844b5c439ab6afc2098c5c4c60ed9c3d167c2f87517f1e93b34f39be3d3dad09'
-            '8b3bfb5781c865c82dd39170bb56c5dba4e9eabc669f0a59bf74f8eda0cb5c82c629b44a719f9ff9038f28bbb5df9db5a73d898f64b7f441ce87626adf512103')
+            'a186e17e11addd9d19669bbdb5c04e531303a193b54aa1fe234e3e14e2a35b74bf99a802d4e117df1a18ab66b02cd94a35916ad8b9c9c2c7630f1ef68a3fa1b6')
 
 prepare() {
   cd gitaly-$_tag

Modified: ruby27.patch
===================================================================
--- ruby27.patch	2022-06-08 17:13:01 UTC (rev 1229354)
+++ ruby27.patch	2022-06-08 17:39:07 UTC (rev 1229355)
@@ -5,39 +5,37 @@
     Pin sources to ruby2.7 package
 
 diff --git a/Makefile b/Makefile
-index 1d636216c..5ee9fd24f 100644
+index 9ae6572..ef68e36 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -253,7 +253,7 @@ race-go: test-go
- 
+@@ -370,7 +370,7 @@ race-go: test-go
  .PHONY: rspec
- rspec: build prepare-tests
+ ## Run Ruby tests.
+ rspec: 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: check-mod-tidy check-formatting notice-up-to-date check-proto rubocop
-@@ -303,7 +303,7 @@ check-proto: proto no-proto-changes lint-proto
- 
+
+ # 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.
+@@ -421,7 +421,7 @@ clean-ruby-vendor-go:
  .PHONY: rubocop
+ ## Run Rubocop.
  rubocop: ${SOURCE_DIR}/.ruby-bundle
--	${Q}cd ${GITALY_RUBY_DIR} && bundle exec rubocop --parallel
-+	${Q}cd ${GITALY_RUBY_DIR} && bundle-2.7 exec rubocop --parallel
- 
+-	${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
- cover: GO_BUILD_TAGS := ${GO_BUILD_TAGS},postgres
-@@ -370,9 +370,9 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a
+ ## Generate coverage report via Go tests.
+@@ -493,7 +493,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
--	${Q}cd ${GITALY_RUBY_DIR} && bundle config set --local deployment "${BUNDLE_DEPLOYMENT}"
--	${Q}cd ${GITALY_RUBY_DIR} && bundle config # for debugging
 -	${Q}cd ${GITALY_RUBY_DIR} && bundle install
-+	${Q}cd ${GITALY_RUBY_DIR} && bundle-2.7 config set --local deployment "${BUNDLE_DEPLOYMENT}"
++	${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
@@ -56,16 +54,16 @@
 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 {
+@@ -88,7 +88,7 @@ func (inst *Instance) Color(language string) string {
  }
  
- func startGitLinguist(ctx context.Context, cfg config.Cfg, repoPath string, commitID string, linguistCommand string) (*command.Command, error) {
+ func (inst *Instance) startGitLinguist(ctx context.Context, repoPath string, commitID string, linguistCommand string) (*command.Command, error) {
 -	bundle, err := exec.LookPath("bundle")
 +	bundle, err := exec.LookPath("bundle-2.7")
  	if err != nil {
- 		return nil, err
+ 		return nil, fmt.Errorf("finding bundle executable: %w", err)
  	}
-@@ -143,7 +143,7 @@ func openLanguagesJSON(cfg config.Cfg) (io.ReadCloser, error) {
+@@ -155,7 +155,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)`
@@ -78,7 +76,7 @@
 index 6292d1d66..0244056ee 100644
 --- a/internal/gitaly/rubyserver/rubyserver.go
 +++ b/internal/gitaly/rubyserver/rubyserver.go
-@@ -129,7 +129,7 @@ func (s *Server) start() error {
+@@ -200,7 +200,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.

