Date: Tuesday, June 21, 2022 @ 17:58:33 Author: anatolik Revision: 1238854
upgpkg: gitlab-gitaly 15.1.0-1 Modified: gitlab-gitaly/trunk/PKGBUILD gitlab-gitaly/trunk/configs.patch gitlab-gitaly/trunk/ruby27.patch ---------------+ PKGBUILD | 8 ++++---- configs.patch | 22 +++++++++++----------- ruby27.patch | 32 ++++++++++++++++---------------- 3 files changed, 31 insertions(+), 31 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-06-21 17:55:01 UTC (rev 1238853) +++ PKGBUILD 2022-06-21 17:58:33 UTC (rev 1238854) @@ -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.0.2 +pkgver=15.1.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=('bbd4b3b9636523e489db32b3ebba8ffda9a31d8a1f687974ce0af614276075381d6146c8fd2f45ed2a89db9507c0bef8aad83be7e12ae7daf6aefb3d3e687ed1' - '872a6c065113c2415cdbd5a2107501fc849b7e291042ac435b04359c69e78b58e93b294de85bcf910d7e4d64dcfb40902b35e392f61499e9b61ebecc842a4b73' +sha512sums=('28aa16cb17c3d52a4633968959750f1f9d45b570fcbf3685f7b9b43ee41ea04672af1d7a31ba79458eb377b72bd5a28a9d08c0fb6af222d6adc522b0e13a0844' + '17a8080eaaef88c53bbe84836a2fa861cf04239346e44bb77d6a4b1c9255b5fefcc3413a23cf7c8156c9189f2825b4bd6e72c98439cf3facceb11748b669185a' '7f5cd528c873a5e43e18aa6a88bd7298422c047e0e61cf3208be7d9fcfdfdc8a844b5c439ab6afc2098c5c4c60ed9c3d167c2f87517f1e93b34f39be3d3dad09' - 'a186e17e11addd9d19669bbdb5c04e531303a193b54aa1fe234e3e14e2a35b74bf99a802d4e117df1a18ab66b02cd94a35916ad8b9c9c2c7630f1ef68a3fa1b6') + '3fcd67cc574d30adda3ac0f0bb0e665b2ed41ae6364bcffb6faf208008cf4ceac2477619d943d251fadf00ff4720967da29297ad925b9efdf95000e1f88ced61') prepare() { cd gitaly-$_tag Modified: configs.patch =================================================================== --- configs.patch 2022-06-21 17:55:01 UTC (rev 1238853) +++ configs.patch 2022-06-21 17:58:33 UTC (rev 1238854) @@ -1,6 +1,6 @@ -commit 7c74563bdb785dc7c87a35475ecc61d02a8a5826 +commit 9aef34b89229e115ebf7a8e86f2370e9b1a3f1e4 Author: Anatol Pomozov <anatol.pomo...@gmail.com> -Date: Tue May 26 00:26:02 2020 -0700 +Date: Tue Jun 21 09:35:40 2022 -0700 Patch config files with Arch Linux specific locations @@ -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 eaa23fd8e..0e483e8b9 100644 +index 9a4753e1e..682083d8e 100644 --- a/config.toml.example +++ b/config.toml.example @@ -2,10 +2,10 @@ @@ -29,9 +29,9 @@ -bin_dir = "/home/git/gitaly/_build/bin" +bin_dir = "/usr/bin" - # # Optional: listen on a TCP socket. This is insecure (no authentication) - # listen_addr = "localhost:9999" -@@ -17,7 +17,7 @@ bin_dir = "/home/git/gitaly/_build/bin" + # # Optional: The directory where Gitaly can create all files required to + # # properly operate at runtime. If not set, Gitaly will create a directory in +@@ -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. # # Non Gitaly clients should never connect to these sockets. @@ -40,7 +40,7 @@ # # Optional: authenticate Gitaly requests using a shared secret # [auth] -@@ -25,8 +25,8 @@ bin_dir = "/home/git/gitaly/_build/bin" +@@ -30,8 +30,8 @@ bin_dir = "/home/git/gitaly/_build/bin" # transitioning = false # Set `transitioning` to true to temporarily allow unauthenticated while rolling out authentication. # [tls] @@ -51,7 +51,7 @@ # # Git settings # [git] -@@ -38,7 +38,7 @@ bin_dir = "/home/git/gitaly/_build/bin" +@@ -51,7 +51,7 @@ bin_dir = "/home/git/gitaly/_build/bin" [[storage]] name = "default" @@ -60,7 +60,7 @@ # # You can optionally configure more storages for this Gitaly instance to serve up # -@@ -50,7 +50,7 @@ path = "/home/git/repositories" +@@ -63,7 +63,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 -@@ -68,7 +68,7 @@ dir = "/home/git/gitlab/log" +@@ -81,7 +81,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 -@@ -88,14 +88,14 @@ dir = "/home/git/gitaly/ruby" +@@ -101,14 +101,14 @@ dir = "/home/git/gitaly/ruby" [gitlab-shell] # The directory where gitlab-shell is installed Modified: ruby27.patch =================================================================== --- ruby27.patch 2022-06-21 17:55:01 UTC (rev 1238853) +++ ruby27.patch 2022-06-21 17:58:33 UTC (rev 1238854) @@ -1,32 +1,32 @@ -commit 939e0390baecae6c4d4283c58c48921857ae8183 +commit 97a8954f6d7764a0f010875093395d42578e309f Author: Anatol Pomozov <anatol.pomo...@gmail.com> -Date: Mon Mar 22 18:23:32 2021 -0700 +Date: Tue Jun 21 09:37:26 2022 -0700 Pin sources to ruby2.7 package diff --git a/Makefile b/Makefile -index 9ae6572..ef68e36 100644 +index 117498e19..74e3254ec 100644 --- a/Makefile +++ b/Makefile -@@ -370,7 +370,7 @@ race-go: test-go +@@ -374,7 +374,7 @@ race-go: test-go .PHONY: rspec ## 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 - + # 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: +@@ -425,7 +425,7 @@ clean-ruby-vendor-go: .PHONY: rubocop ## Run Rubocop. rubocop: ${SOURCE_DIR}/.ruby-bundle - ${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. -@@ -493,7 +493,9 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a +@@ -497,7 +497,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 @@ -35,7 +35,7 @@ + ${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 @@ -51,19 +51,19 @@ write_ruby_requires diff --git a/internal/gitaly/linguist/linguist.go b/internal/gitaly/linguist/linguist.go -index 42218e32a..c0652292a 100644 +index 4ac9abfd2..29b6add09 100644 --- a/internal/gitaly/linguist/linguist.go +++ b/internal/gitaly/linguist/linguist.go -@@ -88,7 +88,7 @@ func (inst *Instance) Color(language string) string { +@@ -87,7 +87,7 @@ func (inst *Instance) Color(language string) string { } - func (inst *Instance) startGitLinguist(ctx context.Context, repoPath string, commitID string, linguistCommand string) (*command.Command, error) { + 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) } -@@ -155,7 +155,7 @@ func openLanguagesJSON(cfg config.Cfg) (io.ReadCloser, error) { +@@ -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)` @@ -73,10 +73,10 @@ // 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 6292d1d66..0244056ee 100644 +index 5ac213e72..5d71ddeed 100644 --- a/internal/gitaly/rubyserver/rubyserver.go +++ b/internal/gitaly/rubyserver/rubyserver.go -@@ -200,7 +200,7 @@ func (s *Server) start() error { +@@ -190,7 +190,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 +86,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 d37352945..7f096fa33 100755 +index c0f17b1e5..31121e12e 100755 --- a/ruby/bin/gitaly-ruby +++ b/ruby/bin/gitaly-ruby @@ -1,4 +1,4 @@