[arch-commits] Commit in gitlab-gitaly/repos (5 files)

Felix Yan felixonmars at archlinux.org
Thu Apr 15 13:25:44 UTC 2021


    Date: Thursday, April 15, 2021 @ 13:25:43
  Author: felixonmars
Revision: 919054

archrelease: copy trunk to community-staging-x86_64

Added:
  gitlab-gitaly/repos/community-staging-x86_64/
  gitlab-gitaly/repos/community-staging-x86_64/PKGBUILD
    (from rev 919053, gitlab-gitaly/trunk/PKGBUILD)
  gitlab-gitaly/repos/community-staging-x86_64/configs.patch
    (from rev 919053, gitlab-gitaly/trunk/configs.patch)
  gitlab-gitaly/repos/community-staging-x86_64/gitlab-gitaly.service
    (from rev 919053, gitlab-gitaly/trunk/gitlab-gitaly.service)
  gitlab-gitaly/repos/community-staging-x86_64/ruby27.patch
    (from rev 919053, gitlab-gitaly/trunk/ruby27.patch)

-----------------------+
 PKGBUILD              |   57 +++++++++++++++++++++++++
 configs.patch         |   99 ++++++++++++++++++++++++++++++++++++++++++++
 gitlab-gitaly.service |   14 ++++++
 ruby27.patch          |  107 ++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 277 insertions(+)

Copied: gitlab-gitaly/repos/community-staging-x86_64/PKGBUILD (from rev 919053, gitlab-gitaly/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2021-04-15 13:25:43 UTC (rev 919054)
@@ -0,0 +1,57 @@
+# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
+
+# NOTE: Gitlab isn't always compatible with modern Ruby versions. In that case, check the
+# 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
+pkgdesc="Speed up Git access using caching"
+arch=('x86_64')
+url="https://gitlab.com/gitlab-org/gitaly"
+license=('MIT')
+depends=(glibc ruby2.7 libxml2 libxslt libssh2)
+options=(!buildflags)
+makedepends=(go cmake git)
+backup=("etc/gitlab-gitaly/config.toml")
+_tag=v${pkgver}
+source=("https://gitlab.com/gitlab-org/gitaly/-/archive/${_tag}/gitaly-${_tag}.tar.gz"
+        "configs.patch"
+        "gitlab-gitaly.service"
+	"ruby27.patch")
+sha512sums=('f9b999feeffa07904e52a4fe8dbfe19abac1250dd64cb21b6cf9e9a215c482601ae1d09fe712bc9b21c81551ee4cbe3ad7d688ebac25f1ce95c345327cdc7c6c'
+            '1b83abe2034a195c33a6dbb7907f93d33b53bd94dc983be5dee5533a1e61cc41fd5228e04dcd2b2576a87a371bf5ab7c81212262421ee7c6ec46c949da4c1153'
+            '7f5cd528c873a5e43e18aa6a88bd7298422c047e0e61cf3208be7d9fcfdfdc8a844b5c439ab6afc2098c5c4c60ed9c3d167c2f87517f1e93b34f39be3d3dad09'
+            '69a39aa1c4ec5cda6bbd3d71fefc6b06b8d294f9663a9af7a09288cea336b0b3dd03aef6688479c79b3ca2afa52b21a0e71b5ab49328bb938c7b38aa9fb0b4ac')
+
+prepare() {
+  cd gitaly-$_tag
+
+  patch -p1 < ../ruby27.patch
+
+  patch -p1 < ../configs.patch
+  # At this point the config file should not contain any references to '/home/git'
+
+  # https://github.com/bundler/bundler/issues/6882
+  sed -e '/BUNDLED WITH/,+1d' -i ruby/Gemfile.lock
+}
+
+build() {
+  cd gitaly-$_tag
+
+  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"
+}
+
+package() {
+  cd gitaly-$_tag
+
+  make PREFIX=/usr DESTDIR="${pkgdir}" install
+  mkdir -p "${pkgdir}"/etc/gitlab-gitaly
+  mkdir -p "${pkgdir}"/usr/share/webapps/gitlab-gitaly
+  cp -r ruby "${pkgdir}"/usr/share/webapps/gitlab-gitaly/ruby
+
+  install -Dm644 config.toml.example "${pkgdir}"/etc/${pkgname}/config.toml
+  install -Dm644 "LICENSE" "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+  install -Dm644 "${srcdir}"/gitlab-gitaly.service "${pkgdir}"/usr/lib/systemd/system/gitlab-gitaly.service
+}

Copied: gitlab-gitaly/repos/community-staging-x86_64/configs.patch (from rev 919053, gitlab-gitaly/trunk/configs.patch)
===================================================================
--- community-staging-x86_64/configs.patch	                        (rev 0)
+++ community-staging-x86_64/configs.patch	2021-04-15 13:25:43 UTC (rev 919054)
@@ -0,0 +1,99 @@
+commit 438448e3b000359b1c9ec16d2918605888f5903e
+Author: Anatol Pomozov <anatol.pomozov at gmail.com>
+Date:   Tue May 26 00:26:02 2020 -0700
+
+    Patch config files with Arch Linux specific locations
+    
+    Arch uses upstream's default config files as a base for its configs.
+    But directory structure at Arch is completely different from the default
+    one specified by gitlab project.
+    We used to have a lot of seds expressions to adjust the files but as
+    complexity of configs grew 'sed' makes it easy to miss a changed/added
+    option.
+    
+    Track set of diffs as a patch. If upstream modifies config file then it
+    will cause a conflict that needs to be reviewed manually.
+
+diff --git a/config.toml.example b/config.toml.example
+index befe90a3..d4317462 100644
+--- a/config.toml.example
++++ b/config.toml.example
+@@ -2,10 +2,10 @@
+ # Documentation lives at https://docs.gitlab.com/ee/administration/gitaly/ and
+ # https://docs.gitlab.com/ee//administration/gitaly/reference
+ 
+-socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket"
++socket_path = "/run/gitlab/gitlab-gitaly.socket"
+ 
+ # The directory where Gitaly's executables are stored
+-bin_dir = "/home/git/gitaly"
++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"
+ # # 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.
+-# internal_socket_dir = "/home/git/gitlab/tmp/sockets/private/internal"
++# internal_socket_dir = "/run/gitlab/private"
+ 
+ # # Optional: authenticate Gitaly requests using a shared secret
+ # [auth]
+@@ -25,8 +25,8 @@ bin_dir = "/home/git/gitaly"
+ # transitioning = false # Set `transitioning` to true to temporarily allow unauthenticated while rolling out authentication.
+ 
+ # [tls]
+-# certificate_path = '/home/git/cert.cert'
+-# key_path = '/home/git/key.pem'
++# certificate_path = '/var/lib/gitlab/cert.cert'
++# key_path = '/var/lib/gitlab/key.pem'
+ 
+ # # Git settings
+ # [git]
+@@ -35,7 +35,7 @@ bin_dir = "/home/git/gitaly"
+ 
+ [[storage]]
+ name = "default"
+-path = "/home/git/repositories"
++path = "/var/lib/gitlab/repositories"
+ 
+ # # You can optionally configure more storages for this Gitaly instance to serve up
+ #
+@@ -47,7 +47,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
+-dir = "/home/git/gitlab/log"
++dir = "/var/log/gitlab"
+ # 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"
+ 
+ [gitaly-ruby]
+ # The directory where gitaly-ruby is installed
+-dir = "/home/git/gitaly/ruby"
++dir = "/usr/share/webapps/gitlab-gitaly/ruby"
+ 
+ # # Gitaly-ruby resident set size (RSS) that triggers a memory restart (bytes)
+ # max_rss = 200000000
+@@ -85,14 +85,14 @@ dir = "/home/git/gitaly/ruby"
+ 
+ [gitlab-shell]
+ # The directory where gitlab-shell is installed
+-dir = "/home/git/gitlab-shell"
++dir = "/usr/share/webapps/gitlab-shell"
+ 
+ [hooks]
+-custom_hooks_dir = "/home/git/custom_hooks"
++custom_hooks_dir = "/var/lib/gitlab/custom_hooks"
+ 
+ [gitlab]
+-secret_file = "/home/git/gitlab-shell/.gitlab_shell_secret"
+-url = "http+unix://%2Fhome%2Fgit%2Fgitlab%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket"
++secret_file = "/etc/webapps/gitlab-shell/secret"
++url = "http+unix://%2Frun%2Fgitlab%2Fgitlab.socket"
+ # Only needed if a UNIX socket is used in `url` and GitLab is configured to
+ # use a relative path (e.g. /gitlab).
+ # relative_url_root = '/'

Copied: gitlab-gitaly/repos/community-staging-x86_64/gitlab-gitaly.service (from rev 919053, gitlab-gitaly/trunk/gitlab-gitaly.service)
===================================================================
--- community-staging-x86_64/gitlab-gitaly.service	                        (rev 0)
+++ community-staging-x86_64/gitlab-gitaly.service	2021-04-15 13:25:43 UTC (rev 919054)
@@ -0,0 +1,14 @@
+[Unit]
+Description=Gitaly is a Git RPC service for handling all the git calls made by GitLab.
+
+[Service]
+Type=simple
+User=gitlab
+Group=gitlab
+WorkingDirectory=/usr/share/webapps/gitlab
+SyslogIdentifier=gitlab-gitaly
+PIDFile=/run/gitlab/gitaly.pid
+ExecStart=/usr/bin/gitaly /etc/gitlab-gitaly/config.toml
+
+[Install]
+WantedBy=multi-user.target

Copied: gitlab-gitaly/repos/community-staging-x86_64/ruby27.patch (from rev 919053, gitlab-gitaly/trunk/ruby27.patch)
===================================================================
--- community-staging-x86_64/ruby27.patch	                        (rev 0)
+++ community-staging-x86_64/ruby27.patch	2021-04-15 13:25:43 UTC (rev 919054)
@@ -0,0 +1,107 @@
+commit 11cf218d4946602c7315fd5d661912ac58fd6780
+Author: Anatol Pomozov <anatol.pomozov at gmail.com>
+Date:   Mon Mar 22 18:23:32 2021 -0700
+
+    Pin sources to ruby2.7 package
+
+diff --git a/Makefile b/Makefile
+index db944c7e9..a025583bf 100644
+--- a/Makefile
++++ b/Makefile
+@@ -273,7 +273,7 @@ race-go: test-go
+ 
+ .PHONY: rspec
+ rspec: assemble-go 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
+@@ -323,7 +323,7 @@ check-proto: proto no-proto-changes lint-proto
+ 
+ .PHONY: 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
+ 
+ .PHONY: cover
+ cover: GO_BUILD_TAGS := ${GO_BUILD_TAGS},postgres
+@@ -381,8 +381,8 @@ 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 # for debugging
+-	${Q}cd ${GITALY_RUBY_DIR} && bundle install ${BUNDLE_FLAGS}
++	${Q}cd ${GITALY_RUBY_DIR} && bundle-2.7 config # for debugging
++	${Q}cd ${GITALY_RUBY_DIR} && bundle-2.7 install ${BUNDLE_FLAGS}
+ 	${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 9356a8af1..02aa84239 100644
+--- a/internal/gitaly/linguist/linguist.go
++++ b/internal/gitaly/linguist/linguist.go
+@@ -74,7 +74,7 @@ func LoadColors(cfg *config.Cfg) error {
+ }
+ 
+ func startGitLinguist(ctx context.Context, cfg config.Cfg, 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
+ 	}
+@@ -136,7 +136,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 237b01c42..2dc8743e7 100644
+--- a/internal/gitaly/rubyserver/rubyserver.go
++++ b/internal/gitaly/rubyserver/rubyserver.go
+@@ -123,7 +123,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.
+-		args := []string{"bundle", "exec", "bin/ruby-cd", wd, gitalyRuby, strconv.Itoa(os.Getpid()), socketPath}
++		args := []string{"bundle-2.7", "exec", "bin/ruby-cd", wd, gitalyRuby, strconv.Itoa(os.Getpid()), socketPath}
+ 
+ 		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
+--- a/ruby/bin/gitaly-ruby
++++ b/ruby/bin/gitaly-ruby
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby-2.7
+ 
+ # Gitaly always spawns this executable with LANG=en_US.UTF-8. In case the
+ # system doesn't have this local, Ruby will fall back to the C locale and as a
+diff --git a/ruby/bin/ruby-cd b/ruby/bin/ruby-cd
+index 9c60fcd42..15f0cb05a 100755
+--- a/ruby/bin/ruby-cd
++++ b/ruby/bin/ruby-cd
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby-2.7
+ 
+ # This script lets you run `bundle exec` in one directory, and then changes into another.
+ 



More information about the arch-commits mailing list