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

Anatol Pomozov anatolik at archlinux.org
Mon May 10 17:37:19 UTC 2021 

    Date: Monday, May 10, 2021 @ 17:37:19
  Author: anatolik
Revision: 929580

upgpkg: gitlab-gitaly 13.11.3-1

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

---------------+
 PKGBUILD      |   10 +++++-----
 configs.patch |   12 ++++++------
 ruby27.patch  |   22 ++++++++++++----------
 3 files changed, 23 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-10 17:29:02 UTC (rev 929579)
+++ PKGBUILD	2021-05-10 17:37:19 UTC (rev 929580)
@@ -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=13.10.0
-pkgrel=2
+pkgver=13.11.3
+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=('f9b999feeffa07904e52a4fe8dbfe19abac1250dd64cb21b6cf9e9a215c482601ae1d09fe712bc9b21c81551ee4cbe3ad7d688ebac25f1ce95c345327cdc7c6c'
-            '1b83abe2034a195c33a6dbb7907f93d33b53bd94dc983be5dee5533a1e61cc41fd5228e04dcd2b2576a87a371bf5ab7c81212262421ee7c6ec46c949da4c1153'
+sha512sums=('9823c6bc317c6fa1e30fc3eb15709508454c145ac57e95bb152d7c7a7046d08a50b0d9d0bebe6d825d49ea327b391160d31d2cae094b47eea2dd44ecb7dcbe43'
+            '2988766ff7839664af2b621984eee3b52056d7c606823deb77a4d7604069b1e294a6364e0607c5e629617fc49a80ad6ac76be5673e9d5b26fa54c2b7e66bc4ca'
             '7f5cd528c873a5e43e18aa6a88bd7298422c047e0e61cf3208be7d9fcfdfdc8a844b5c439ab6afc2098c5c4c60ed9c3d167c2f87517f1e93b34f39be3d3dad09'
-            '69a39aa1c4ec5cda6bbd3d71fefc6b06b8d294f9663a9af7a09288cea336b0b3dd03aef6688479c79b3ca2afa52b21a0e71b5ab49328bb938c7b38aa9fb0b4ac')
+            'ce6a20bb4348c04ed633cd71716ef836dfd3b0207307735305c12e5b76bef9df8654a96dfba10222a5c21cb126adc0cce008b515c377a2ea81d8c1e13c976c29')
 
 prepare() {
   cd gitaly-$_tag

Modified: configs.patch
===================================================================
--- configs.patch	2021-05-10 17:29:02 UTC (rev 929579)
+++ configs.patch	2021-05-10 17:37:19 UTC (rev 929580)
@@ -1,4 +1,4 @@
-commit 438448e3b000359b1c9ec16d2918605888f5903e
+commit 795c110901b9866ea87edceca1e6e650d9f2a19e
 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 befe90a3..d4317462 100644
+index 223e91d4e..0e483e8b9 100644
 --- a/config.toml.example
 +++ b/config.toml.example
 @@ -2,10 +2,10 @@
@@ -51,7 +51,7 @@
  
  # # Git settings
  # [git]
-@@ -35,7 +35,7 @@ bin_dir = "/home/git/gitaly"
+@@ -38,7 +38,7 @@ bin_dir = "/home/git/gitaly"
  
  [[storage]]
  name = "default"
@@ -60,7 +60,7 @@
  
  # # You can optionally configure more storages for this Gitaly instance to serve up
  #
-@@ -47,7 +47,7 @@ path = "/home/git/repositories"
+@@ -50,7 +50,7 @@ path = "/home/git/repositories"
  # # You can optionally configure Gitaly to output JSON-formatted log messages to stdout
  # [logging]
  # # The directory where Gitaly stores extra log files
@@ -69,7 +69,7 @@
  # 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
-@@ -65,7 +65,7 @@ dir = "/home/git/gitlab/log"
+@@ -68,7 +68,7 @@ dir = "/home/git/gitlab/log"
  
  [gitaly-ruby]
  # The directory where gitaly-ruby is installed
@@ -78,7 +78,7 @@
  
  # # Gitaly-ruby resident set size (RSS) that triggers a memory restart (bytes)
  # max_rss = 200000000
-@@ -85,14 +85,14 @@ dir = "/home/git/gitaly/ruby"
+@@ -88,14 +88,14 @@ dir = "/home/git/gitaly/ruby"
  
  [gitlab-shell]
  # The directory where gitlab-shell is installed

Modified: ruby27.patch
===================================================================
--- ruby27.patch	2021-05-10 17:29:02 UTC (rev 929579)
+++ ruby27.patch	2021-05-10 17:37:19 UTC (rev 929580)
@@ -1,4 +1,4 @@
-commit 11cf218d4946602c7315fd5d661912ac58fd6780
+commit 1934e7908a3cfa3b6c14501770c7cac4ecbf3710
 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 db944c7e9..a025583bf 100644
+index d576eb121..cdfc65790 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -273,7 +273,7 @@ race-go: test-go
+@@ -280,7 +280,7 @@ race-go: test-go
  
  .PHONY: rspec
  rspec: assemble-go prepare-tests
@@ -17,7 +17,7 @@
  
  .PHONY: verify
  verify: check-mod-tidy check-formatting notice-up-to-date check-proto rubocop
-@@ -323,7 +323,7 @@ check-proto: proto no-proto-changes lint-proto
+@@ -330,7 +330,7 @@ check-proto: proto no-proto-changes lint-proto
  
  .PHONY: rubocop
  rubocop: ${SOURCE_DIR}/.ruby-bundle
@@ -26,14 +26,16 @@
  
  .PHONY: cover
  cover: GO_BUILD_TAGS := ${GO_BUILD_TAGS},postgres
-@@ -381,8 +381,8 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a
+@@ -388,9 +388,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 ${BUNDLE_FLAGS}
+-	${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 # for debugging
-+	${Q}cd ${GITALY_RUBY_DIR} && bundle-2.7 install ${BUNDLE_FLAGS}
++	${Q}cd ${GITALY_RUBY_DIR} && bundle-2.7 install
  	${Q}touch $@
  
  ${SOURCE_DIR}/NOTICE: ${BUILD_DIR}/NOTICE
@@ -51,10 +53,10 @@
  
    write_ruby_requires
 diff --git a/internal/gitaly/linguist/linguist.go b/internal/gitaly/linguist/linguist.go
-index 9356a8af1..02aa84239 100644
+index 8cb187569..5bc8975ef 100644
 --- a/internal/gitaly/linguist/linguist.go
 +++ b/internal/gitaly/linguist/linguist.go
-@@ -74,7 +74,7 @@ func LoadColors(cfg *config.Cfg) error {
+@@ -81,7 +81,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) {
@@ -63,7 +65,7 @@
  	if err != nil {
  		return nil, err
  	}
-@@ -136,7 +136,7 @@ func openLanguagesJSON(cfg *config.Cfg) (io.ReadCloser, error) {
+@@ -143,7 +143,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)`

More information about the arch-commits mailing list