Skip to content

Commit

Permalink
devel/gitaly: update to 15.9.0
Browse files Browse the repository at this point in the history 
Required for gitlab-ce 15.9
  • Loading branch information
@mfechner
mfechner committed Apr 3, 2023
1 parent a321a38 commit e6e749e
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 33 deletions.
19 changes: 10 additions & 9 deletions devel/gitaly/Makefile
View file
@@ -1,5 +1,5 @@
PORTNAME= gitaly
DISTVERSION= 15.8.5
DISTVERSION= 15.9.0
PORTREVISION= 0
DISTVERSIONPREFIX= v
CATEGORIES= devel
Expand All @@ -18,23 +18,24 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
# define dependencies that are required for build and run under MY_DEPENDS
MY_DEPENDS= git>=2.39.2:devel/git \
rubygem-bundler>=2.1.4:sysutils/rubygem-bundler \
rubygem-rugged>=1.2<2:devel/rubygem-rugged \
rubygem-gitlab-markup>=1.8.0<1.9.0:textproc/rubygem-gitlab-markup \
rubygem-activesupport61>=6.1.6<6.2:devel/rubygem-activesupport61 \
rubygem-rugged>=1.5.1<1.6:devel/rubygem-rugged \
rubygem-gitlab-markup>=1.9.0<1.10.0:textproc/rubygem-gitlab-markup \
rubygem-activesupport61>=6.1.7.2<6.1.8:devel/rubygem-activesupport61 \
rubygem-grpc142>=1.42.0<2:net/rubygem-grpc142 \
rubygem-sentry-raven>=3.0<4:devel/rubygem-sentry-raven \
rubygem-sentry-raven>=3.1<4:devel/rubygem-sentry-raven \
rubygem-rbtrace>=0.4.14:devel/rubygem-rbtrace \
rubygem-gitaly>=15.5.0<15.6:net/rubygem-gitaly \
rubygem-gitlab-labkit>=0.29<1:devel/rubygem-gitlab-labkit \
rubygem-gitaly>=15.5.0<15.10:net/rubygem-gitaly \
rubygem-gitlab-labkit>=0.31<1:devel/rubygem-gitlab-labkit \
rubygem-licensee>=9.15<10:devel/rubygem-licensee \
rubygem-google-protobuf>=3.21.12<3.22:devel/rubygem-google-protobuf \
rubygem-nokogiri>=1.14.1<1.15:textproc/rubygem-nokogiri \
rubygem-license_finder>=7.0<8:devel/rubygem-license_finder \
rubygem-redis4>=4.8.0<5:databases/rubygem-redis4
BUILD_DEPENDS= gem:devel/ruby-gems \
bash>0:shells/bash \
${MY_DEPENDS}
RUN_DEPENDS= ${MY_DEPENDS} \
gitlab-shell>=13.22.1:devel/gitlab-shell
gitlab-shell>=14.17.0:devel/gitlab-shell
LIB_DEPENDS= libgit2.so:devel/libgit2

USES= cpe gmake go:modules,no_targets pkgconfig ruby
Expand All @@ -48,7 +49,7 @@ MAKE_ENV+= ${GO_ENV}
USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
# Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags
GL_COMMIT= 9d5dfbc17849a511253f9db0fd6b737d90e0ac5f
GL_COMMIT= 8839b0c454f83f6ae35a2a6da3041db19384c411

# for go dependencies
# Gitlab hosts there dependencies on their own platform and not on go-proxy
Expand Down
10 changes: 5 additions & 5 deletions devel/gitaly/distinfo
View file
@@ -1,5 +1,5 @@
TIMESTAMP = 1680237669
SHA256 (go/devel_gitaly/gitlab-org-gitaly-9d5dfbc17849a511253f9db0fd6b737d90e0ac5f_GL0/go.mod) = 28e105ea47304435dc1432661b97514170a8df58bc74075417a2e934b57c0d43
SIZE (go/devel_gitaly/gitlab-org-gitaly-9d5dfbc17849a511253f9db0fd6b737d90e0ac5f_GL0/go.mod) = 9702
SHA256 (go/devel_gitaly/gitlab-org-gitaly-9d5dfbc17849a511253f9db0fd6b737d90e0ac5f_GL0/gitlab-org-gitaly-9d5dfbc17849a511253f9db0fd6b737d90e0ac5f_GL0.tar.gz) = f41cd379c0a320c8a0ce37326b345dc6d0fc4768cf8c8df8012f68eafd37089e
SIZE (go/devel_gitaly/gitlab-org-gitaly-9d5dfbc17849a511253f9db0fd6b737d90e0ac5f_GL0/gitlab-org-gitaly-9d5dfbc17849a511253f9db0fd6b737d90e0ac5f_GL0.tar.gz) = 2957848
TIMESTAMP = 1677095305
SHA256 (go/devel_gitaly/gitlab-org-gitaly-8839b0c454f83f6ae35a2a6da3041db19384c411_GL0/go.mod) = 605d47badb908e81ce1f6f50b9946a215c2600e2423f10239aa0885c92413a90
SIZE (go/devel_gitaly/gitlab-org-gitaly-8839b0c454f83f6ae35a2a6da3041db19384c411_GL0/go.mod) = 10219
SHA256 (go/devel_gitaly/gitlab-org-gitaly-8839b0c454f83f6ae35a2a6da3041db19384c411_GL0/gitlab-org-gitaly-8839b0c454f83f6ae35a2a6da3041db19384c411_GL0.tar.gz) = 3070339161e0dd6731147b58ebd12e7c024c2c56d61e2e4b96cf70c03f77bc17
SIZE (go/devel_gitaly/gitlab-org-gitaly-8839b0c454f83f6ae35a2a6da3041db19384c411_GL0/gitlab-org-gitaly-8839b0c454f83f6ae35a2a6da3041db19384c411_GL0.tar.gz) = 3060534
8 changes: 4 additions & 4 deletions devel/gitaly/files/patch-Makefile
View file
@@ -1,14 +1,14 @@
--- Makefile.orig 2023-01-12 20:00:15 UTC
--- Makefile.orig 2023-02-21 16:36:17 UTC
+++ Makefile
@@ -545,7 +545,6 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a
@@ -546,7 +546,6 @@ 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.
${RUBY_BUNDLE_FILE}: ${GITALY_RUBY_DIR}/Gemfile.lock ${GITALY_RUBY_DIR}/Gemfile
- ${Q}cd ${GITALY_RUBY_DIR} && bundle install
${Q}touch $@

${SOURCE_DIR}/NOTICE: ${BUILD_DIR}/NOTICE
@@ -586,7 +585,7 @@ ${BUILD_DIR}/bin/%: ${BUILD_DIR}/intermediate/% | ${BU
@@ -587,7 +586,7 @@ ${BUILD_DIR}/bin/%: ${BUILD_DIR}/intermediate/% | ${BU
@ # This fallback is unique but non-deterministic, making it sufficient to avoid generating the
@ # GNU build-id from the empty string and causing guaranteed collisions.
${Q}GO_BUILD_ID=$$(go tool buildid "$<" || openssl rand -hex 32) && \
Expand All @@ -17,7 +17,7 @@
if test "${OS}" = "Linux"; then \
go run "${SOURCE_DIR}"/tools/replace-buildid \
-input "$<" -input-build-id "${TEMPORARY_BUILD_ID}" \
@@ -612,7 +611,6 @@ ${BUILD_DIR}/intermediate/gitaly: GO_BUILD_
@@ -613,7 +612,6 @@ ${BUILD_DIR}/intermediate/gitaly: GO_BUILD_
${BUILD_DIR}/intermediate/gitaly: remove-legacy-go-mod ${GITALY_PACKED_EXECUTABLES}
${BUILD_DIR}/intermediate/praefect: GO_BUILD_TAGS = ${SERVER_BUILD_TAGS}
${BUILD_DIR}/intermediate/gitaly-git2go: GO_BUILD_TAGS = ${GIT2GO_BUILD_TAGS}
Expand Down
36 changes: 21 additions & 15 deletions devel/gitaly/files/patch-ruby_Gemfile
View file
@@ -1,27 +1,33 @@
--- ruby/Gemfile.orig 2023-01-12 20:00:15 UTC
--- ruby/Gemfile.orig 2023-02-21 16:36:17 UTC
+++ ruby/Gemfile
@@ -1,8 +1,8 @@
@@ -1,7 +1,7 @@
source 'https://rubygems.org'

gem 'rugged', '~> 1.2'
-gem 'gitlab-markup', '~> 1.7.1'
-gem 'activesupport', '~> 6.1.6.1'
+gem 'gitlab-markup', '~> 1.8.0'
+gem 'activesupport', '~> 6.1.6'
gem 'grpc', '~> 1.42.0' # keep in lock-step with grpc-tools
gem 'sentry-raven', '~> 3.0', require: false
gem 'rbtrace', require: false
@@ -25,19 +25,10 @@ gem 'google-protobuf', '~> 3.21.12'
gem 'rugged', '~> 1.5.1'
-gem 'gitlab-markup', '~> 1.8.0'
+gem 'gitlab-markup', '~> 1.9.0'
gem 'activesupport', '~> 6.1.7.2'
gem 'grpc', '~> 1.42.0' # keep in lock-step with grpc-tools in ../tools/protogem
gem 'sentry-raven', '~> 3.1', require: false
@@ -9,7 +9,7 @@ gem 'rbtrace', require: false

# The Gitaly Gem contains the Protobuf and gRPC definitions required by the
# Ruby sidecar.
-gem 'gitaly', '~> 15.5.0'
+gem 'gitaly', '~> 15.5'

# Labkit provides observability functionality
gem 'gitlab-labkit', '~> 0.31'
@@ -26,18 +26,10 @@ gem 'nokogiri', '~> 1.14'
# dependency and can thus be removed when the version constraint is gone.
gem 'redis', '~> 4.8.0'

-group :development, :test do
- gem 'rubocop', '~> 0.69', require: false
- gem 'rspec', require: false
- gem 'rubocop', '~> 1.38', require: false
- gem 'rspec', '~> 3.12.0', require: false
- gem 'rspec-parameterized', require: false
- gem 'timecop', require: false
- gem 'factory_bot', require: false
- gem 'pry', '~> 0.12.2', require: false
- gem 'pry', '~> 0.13.1', require: false
-end
-
# Gems required in omnibus-gitlab pipeline
Expand Down

0 comments on commit e6e749e

Please sign in to comment.