aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Fechner <mfechner@FreeBSD.org>2021-12-21 21:12:01 +0000
committerMatthias Fechner <mfechner@FreeBSD.org>2021-12-22 17:04:25 +0000
commit1cd6234cdf5411d1632f200b50c156e7bf1ce52a (patch)
treef36d8e530f0497b023c32887b195a9697c96b0a6
parentf0d9d6781db22ddc5299080c879e85ba9ca68d78 (diff)
downloadports-1cd6234cdf5411d1632f200b50c156e7bf1ce52a.tar.gz
ports-1cd6234cdf5411d1632f200b50c156e7bf1ce52a.zip
devel/gitaly: update to 14.6.0
Required for gitlab-ce 14.6.
-rw-r--r--devel/gitaly/Makefile11
-rw-r--r--devel/gitaly/distinfo6
-rw-r--r--devel/gitaly/files/patch-4108.patch84
-rw-r--r--devel/gitaly/files/patch-Makefile14
-rw-r--r--devel/gitaly/files/patch-ruby_Gemfile24
5 files changed, 76 insertions, 63 deletions
diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index e42b36174fc5..3fc925b4866d 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gitaly
-DISTVERSION= 14.5.2
+DISTVERSION= 14.6.0
PORTREVISION= 0
CATEGORIES= devel
@@ -18,7 +18,7 @@ MY_DEPENDS= git>=2.33.0:devel/git \
rubygem-bundler>=2.1.4:sysutils/rubygem-bundler \
rubygem-rugged>=1.2<2:devel/rubygem-rugged \
rubygem-github-linguist>=7.12.1<8:textproc/rubygem-github-linguist \
- rubygem-gitlab-markup>=1.7.1<1.8.0:textproc/rubygem-gitlab-markup \
+ rubygem-gitlab-markup>=1.8.0<1.9.0:textproc/rubygem-gitlab-markup \
rubygem-activesupport61>=6.1.4.1<6.1.4.2:devel/rubygem-activesupport61 \
rubygem-rdoc>=6.3.2<7.0:devel/rubygem-rdoc \
rubygem-gitlab-gollum-lib>=4.2.7.10.gitlab.1<4.2.8:www/rubygem-gitlab-gollum-lib \
@@ -34,7 +34,7 @@ BUILD_DEPENDS= gem:devel/ruby-gems \
bash>0:shells/bash \
${MY_DEPENDS}
RUN_DEPENDS= ${MY_DEPENDS} \
- gitlab-shell>=9.3.0:devel/gitlab-shell
+ gitlab-shell>=13.22.1:devel/gitlab-shell
LIB_DEPENDS= libgit2.so:devel/libgit2
USES= cpe gmake go:modules,no_targets pkgconfig
@@ -49,12 +49,12 @@ MAKE_ENV+= ${GO_ENV}
USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
# Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags
-GL_COMMIT= 5d5df6138d9bc6b93503ee529a5b099ea8e5e839
+GL_COMMIT= b7ed739365ce6c15aad81faaf6367151d701ce85
# for go dependencies
USE_GITHUB= nodefault
# generated with: make gomod-vendor
-# 138dd
+# 137dd
GH_TUPLE= \
Azure:azure-pipeline-go:v0.2.3:azure_azure_pipeline_go/vendor/github.com/Azure/azure-pipeline-go \
Azure:azure-storage-blob-go:v0.13.0:azure_azure_storage_blob_go/vendor/github.com/Azure/azure-storage-blob-go \
@@ -231,3 +231,4 @@ post-install:
.include <bsd.port.mk>
+
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index e95a5b13ff2c..4344e2b3b584 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1638857864
+TIMESTAMP = 1640119532
SHA256 (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 99bd58f4a07dd02d9615e3638b3bb6dbfad80ef678ccdb8e17e3fa2b0fef343e
SIZE (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 17102
SHA256 (Azure-azure-storage-blob-go-v0.13.0_GH0.tar.gz) = 6bf7145210331efa3f0417f6684cf764c22743cf23122048ec136600daebf443
@@ -265,8 +265,8 @@ SHA256 (xanzy-ssh-agent-v0.3.0_GH0.tar.gz) = 7ce80a93d0fdbeb6760f97d6d166d11c215
SIZE (xanzy-ssh-agent-v0.3.0_GH0.tar.gz) = 8421
SHA256 (gonum-gonum-v0.8.2_GH0.tar.gz) = a2aad1ac038d36d568939910f39eb0c58cae3c6f0b18df3ca74a8daa954d1663
SIZE (gonum-gonum-v0.8.2_GH0.tar.gz) = 3226037
-SHA256 (gitlab-org-gitaly-5d5df6138d9bc6b93503ee529a5b099ea8e5e839_GL0.tar.gz) = cef6581f8c979f1fb90d7d6fcf71b5a341e23a1e2aa21c75345358ec4abbee29
-SIZE (gitlab-org-gitaly-5d5df6138d9bc6b93503ee529a5b099ea8e5e839_GL0.tar.gz) = 3719989
+SHA256 (gitlab-org-gitaly-b7ed739365ce6c15aad81faaf6367151d701ce85_GL0.tar.gz) = d56df7db1f7deadc51180479cc2cfa5833d6a542de5cffba75d1b185b43a1103
+SIZE (gitlab-org-gitaly-b7ed739365ce6c15aad81faaf6367151d701ce85_GL0.tar.gz) = 3761596
SHA256 (gitlab-org-gitlab-shell-50da611814d256c77e689977265ec7e07633a4dc_GL0.tar.gz) = a00e10d3dbe50e7c70b75c5fcf7d42a039a24c13b0b751a0339bb18261ac50af
SIZE (gitlab-org-gitlab-shell-50da611814d256c77e689977265ec7e07633a4dc_GL0.tar.gz) = 124516
SHA256 (gitlab-org-labkit-397363e2404ac0276b1959373a1c1c2bc1610d67_GL0.tar.gz) = e48dae8ea183f946189a9ac7e4cbe4bc0fa583e6baafb0074a3463a879565ecb
diff --git a/devel/gitaly/files/patch-4108.patch b/devel/gitaly/files/patch-4108.patch
index 90551051d743..14a063e657f8 100644
--- a/devel/gitaly/files/patch-4108.patch
+++ b/devel/gitaly/files/patch-4108.patch
@@ -1,4 +1,4 @@
---- ruby/proto/gitaly/blob_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/blob_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/blob_pb.rb
@@ -1,10 +1,10 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -13,7 +13,7 @@
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("blob.proto", :syntax => :proto3) do
add_message "gitaly.GetBlobRequest" do
---- ruby/proto/gitaly/blob_services_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/blob_services_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/blob_services_pb.rb
@@ -8,7 +8,7 @@ module Gitaly
module BlobService
@@ -61,7 +61,7 @@
end
Stub = Service.rpc_stub_class
---- ruby/proto/gitaly/cleanup_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/cleanup_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/cleanup_pb.rb
@@ -1,10 +1,10 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -76,7 +76,7 @@
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("cleanup.proto", :syntax => :proto3) do
add_message "gitaly.ApplyBfgObjectMapStreamRequest" do
---- ruby/proto/gitaly/cleanup_services_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/cleanup_services_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/cleanup_services_pb.rb
@@ -8,13 +8,13 @@ module Gitaly
module CleanupService
@@ -94,7 +94,7 @@
end
Stub = Service.rpc_stub_class
---- ruby/proto/gitaly/commit_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/commit_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/commit_pb.rb
@@ -1,11 +1,11 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -110,7 +110,7 @@
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("commit.proto", :syntax => :proto3) do
add_message "gitaly.ListCommitsRequest" do
---- ruby/proto/gitaly/commit_services_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/commit_services_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/commit_services_pb.rb
@@ -8,7 +8,7 @@ module Gitaly
module CommitService
@@ -121,7 +121,7 @@
self.marshal_class_method = :encode
self.unmarshal_class_method = :decode
---- ruby/proto/gitaly/conflicts_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/conflicts_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/conflicts_pb.rb
@@ -1,11 +1,11 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -137,7 +137,7 @@
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("conflicts.proto", :syntax => :proto3) do
add_message "gitaly.ListConflictFilesRequest" do
---- ruby/proto/gitaly/conflicts_services_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/conflicts_services_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/conflicts_services_pb.rb
@@ -8,17 +8,17 @@ module Gitaly
module ConflictsService
@@ -160,7 +160,7 @@
end
Stub = Service.rpc_stub_class
---- ruby/proto/gitaly/diff_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/diff_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/diff_pb.rb
@@ -1,10 +1,10 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -175,7 +175,7 @@
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("diff.proto", :syntax => :proto3) do
add_message "gitaly.CommitDiffRequest" do
---- ruby/proto/gitaly/diff_services_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/diff_services_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/diff_services_pb.rb
@@ -8,21 +8,21 @@ module Gitaly
module DiffService
@@ -206,7 +206,7 @@
end
Stub = Service.rpc_stub_class
---- ruby/proto/gitaly/hook_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/hook_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/hook_pb.rb
@@ -1,10 +1,10 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -221,9 +221,9 @@
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("hook.proto", :syntax => :proto3) do
add_message "gitaly.PreReceiveHookRequest" do
---- ruby/proto/gitaly/hook_services_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/hook_services_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/hook_services_pb.rb
-@@ -8,23 +8,23 @@ module Gitaly
+@@ -8,21 +8,21 @@ module Gitaly
module HookService
class Service
@@ -242,9 +242,7 @@
+ rpc :PostReceiveHook, stream(::Gitaly::PostReceiveHookRequest), stream(::Gitaly::PostReceiveHookResponse)
+ rpc :UpdateHook, ::Gitaly::UpdateHookRequest, stream(::Gitaly::UpdateHookResponse)
+ rpc :ReferenceTransactionHook, stream(::Gitaly::ReferenceTransactionHookRequest), stream(::Gitaly::ReferenceTransactionHookResponse)
- # PackObjectsHook is meant to be called by git-upload-pack via the
- # uploadpack.packObjectsHook mechanism. It generates a stream of packed
- # Git objects.
+ # PackObjectsHook has been replaced by PackObjectsHookWithSidechannel. Remove in 15.0.
- rpc :PackObjectsHook, stream(Gitaly::PackObjectsHookRequest), stream(Gitaly::PackObjectsHookResponse)
+ rpc :PackObjectsHook, stream(::Gitaly::PackObjectsHookRequest), stream(::Gitaly::PackObjectsHookResponse)
# PackObjectsHookWithSidechannel is an optimized version of PackObjectsHook that uses
@@ -254,7 +252,7 @@
end
Stub = Service.rpc_stub_class
---- ruby/proto/gitaly/internal_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/internal_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/internal_pb.rb
@@ -1,9 +1,9 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -267,7 +265,7 @@
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("internal.proto", :syntax => :proto3) do
add_message "gitaly.WalkReposRequest" do
---- ruby/proto/gitaly/internal_services_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/internal_services_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/internal_services_pb.rb
@@ -10,7 +10,7 @@ module Gitaly
# only reachable by Praefect or other Gitalies
@@ -287,7 +285,7 @@
end
Stub = Service.rpc_stub_class
---- ruby/proto/gitaly/lint_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/lint_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/lint_pb.rb
@@ -1,6 +1,7 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -297,7 +295,7 @@
require 'google/protobuf'
Google::Protobuf::DescriptorPool.generated_pool.build do
---- ruby/proto/gitaly/namespace_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/namespace_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/namespace_pb.rb
@@ -1,9 +1,9 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -310,7 +308,7 @@
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("namespace.proto", :syntax => :proto3) do
add_message "gitaly.AddNamespaceRequest" do
---- ruby/proto/gitaly/namespace_services_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/namespace_services_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/namespace_services_pb.rb
@@ -8,16 +8,16 @@ module Gitaly
module NamespaceService
@@ -334,7 +332,7 @@
end
Stub = Service.rpc_stub_class
---- ruby/proto/gitaly/objectpool_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/objectpool_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/objectpool_pb.rb
@@ -1,10 +1,10 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -349,7 +347,7 @@
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("objectpool.proto", :syntax => :proto3) do
add_message "gitaly.CreateObjectPoolRequest" do
---- ruby/proto/gitaly/operations_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/operations_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/operations_pb.rb
@@ -1,12 +1,12 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -366,7 +364,7 @@
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("operations.proto", :syntax => :proto3) do
add_message "gitaly.UserCreateBranchRequest" do
---- ruby/proto/gitaly/operations_services_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/operations_services_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/operations_services_pb.rb
@@ -12,23 +12,23 @@ module Gitaly
# '/allowed' endpoint.
@@ -445,7 +443,7 @@
end
Stub = Service.rpc_stub_class
---- ruby/proto/gitaly/praefect_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/praefect_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/praefect_pb.rb
@@ -1,10 +1,10 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -459,8 +457,8 @@
+
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("praefect.proto", :syntax => :proto3) do
- add_message "gitaly.SetReplicationFactorRequest" do
---- ruby/proto/gitaly/praefect_services_pb.rb.orig 2021-11-08 11:56:42 UTC
+ add_message "gitaly.GetRepositoryMetadataRequest" do
+--- ruby/proto/gitaly/praefect_services_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/praefect_services_pb.rb
@@ -8,19 +8,19 @@ module Gitaly
module PraefectInfoService
@@ -492,10 +490,10 @@
# factor of repositories assigned to a storage node removed from the cluster is effectively decreased.
- rpc :SetReplicationFactor, Gitaly::SetReplicationFactorRequest, Gitaly::SetReplicationFactorResponse
+ rpc :SetReplicationFactor, ::Gitaly::SetReplicationFactorRequest, ::Gitaly::SetReplicationFactorResponse
+ # GetRepositoryMetadata returns the cluster metadata for a repository. Returns NotFound if the repository does not exist.
+ rpc :GetRepositoryMetadata, Gitaly::GetRepositoryMetadataRequest, Gitaly::GetRepositoryMetadataResponse
end
-
- Stub = Service.rpc_stub_class
---- ruby/proto/gitaly/remote_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/remote_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/remote_pb.rb
@@ -1,10 +1,10 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -510,7 +508,7 @@
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("remote.proto", :syntax => :proto3) do
add_message "gitaly.UpdateRemoteMirrorRequest" do
---- ruby/proto/gitaly/remote_services_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/remote_services_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/remote_services_pb.rb
@@ -8,7 +8,7 @@ module Gitaly
module RemoteService
@@ -539,7 +537,7 @@
end
Stub = Service.rpc_stub_class
---- ruby/proto/gitaly/repository-service_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/repository-service_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/repository-service_pb.rb
@@ -1,10 +1,10 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -554,7 +552,7 @@
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("repository-service.proto", :syntax => :proto3) do
add_message "gitaly.RepositoryExistsRequest" do
---- ruby/proto/gitaly/server_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/server_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/server_pb.rb
@@ -1,9 +1,9 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -567,7 +565,7 @@
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("server.proto", :syntax => :proto3) do
add_message "gitaly.ServerInfoRequest" do
---- ruby/proto/gitaly/server_services_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/server_services_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/server_services_pb.rb
@@ -8,14 +8,14 @@ module Gitaly
module ServerService
@@ -587,7 +585,7 @@
end
Stub = Service.rpc_stub_class
---- ruby/proto/gitaly/shared_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/shared_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/shared_pb.rb
@@ -1,10 +1,10 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -602,7 +600,7 @@
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("shared.proto", :syntax => :proto3) do
add_message "gitaly.Repository" do
---- ruby/proto/gitaly/smarthttp_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/smarthttp_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/smarthttp_pb.rb
@@ -1,10 +1,10 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -617,7 +615,7 @@
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("smarthttp.proto", :syntax => :proto3) do
add_message "gitaly.InfoRefsRequest" do
---- ruby/proto/gitaly/smarthttp_services_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/smarthttp_services_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/smarthttp_services_pb.rb
@@ -8,7 +8,7 @@ module Gitaly
module SmartHTTPService
@@ -651,7 +649,7 @@
end
Stub = Service.rpc_stub_class
---- ruby/proto/gitaly/ssh_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/ssh_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/ssh_pb.rb
@@ -1,10 +1,10 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -666,7 +664,7 @@
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("ssh.proto", :syntax => :proto3) do
add_message "gitaly.SSHUploadPackRequest" do
---- ruby/proto/gitaly/ssh_services_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/ssh_services_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/ssh_services_pb.rb
@@ -8,18 +8,18 @@ module Gitaly
module SSHService
@@ -691,7 +689,7 @@
end
Stub = Service.rpc_stub_class
---- ruby/proto/gitaly/transaction_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/transaction_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/transaction_pb.rb
@@ -1,10 +1,10 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -706,7 +704,7 @@
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("transaction.proto", :syntax => :proto3) do
add_message "gitaly.VoteTransactionRequest" do
---- ruby/proto/gitaly/transaction_services_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/transaction_services_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/transaction_services_pb.rb
@@ -8,14 +8,14 @@ module Gitaly
module RefTransaction
@@ -726,7 +724,7 @@
end
Stub = Service.rpc_stub_class
---- ruby/proto/gitaly/wiki_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/wiki_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/wiki_pb.rb
@@ -1,10 +1,10 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -741,7 +739,7 @@
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("wiki.proto", :syntax => :proto3) do
add_message "gitaly.WikiCommitDetails" do
---- ruby/proto/gitaly/wiki_services_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/wiki_services_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/wiki_services_pb.rb
@@ -8,18 +8,18 @@ module Gitaly
module WikiService
diff --git a/devel/gitaly/files/patch-Makefile b/devel/gitaly/files/patch-Makefile
index b97c94b808e4..bd391cfd859d 100644
--- a/devel/gitaly/files/patch-Makefile
+++ b/devel/gitaly/files/patch-Makefile
@@ -1,15 +1,15 @@
---- Makefile.orig 2021-11-19 08:14:34 UTC
+--- Makefile.orig 2021-12-21 14:02:19 UTC
+++ Makefile
-@@ -282,7 +282,7 @@ help:
+@@ -289,7 +289,7 @@ help:
.PHONY: build
## Build Go binaries and install required Ruby Gems.
-build: ${SOURCE_DIR}/.ruby-bundle libgit2
+build: ${SOURCE_DIR}/.ruby-bundle
- ${Q}# We used to install Gitaly binaries into the source directory by default when executing
- ${Q}# "make" or "make all", which has been changed in v14.5 to only build binaries into
- ${Q}# `_build/bin`. In order to quickly fail in case any source install still refers to these
-@@ -471,7 +471,7 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a
+ @ # We used to install Gitaly binaries into the source directory by default when executing
+ @ # "make" or "make all", which has been changed in v14.5 to only build binaries into
+ @ # `_build/bin`. In order to quickly fail in case any source install still refers to these
+@@ -505,7 +505,7 @@ 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
@@ -18,7 +18,7 @@
${Q}touch $@
${SOURCE_DIR}/NOTICE: ${BUILD_DIR}/NOTICE
-@@ -547,7 +547,7 @@ ${TOOLS_DIR}/protoc.zip: TOOL_VERSION = ${PROTOC_VERSI
+@@ -599,7 +599,7 @@ ${TOOLS_DIR}/protoc.zip: TOOL_VERSION = ${PROTOC_VERSI
${TOOLS_DIR}/protoc.zip: ${TOOLS_DIR}/protoc.version
${Q}if [ -z "${PROTOC_URL}" ]; then echo "Cannot generate protos on unsupported platform ${OS}" && exit 1; fi
curl -o $@.tmp --silent --show-error -L ${PROTOC_URL}
diff --git a/devel/gitaly/files/patch-ruby_Gemfile b/devel/gitaly/files/patch-ruby_Gemfile
index ae4d779912bb..d5e26d0f4701 100644
--- a/devel/gitaly/files/patch-ruby_Gemfile
+++ b/devel/gitaly/files/patch-ruby_Gemfile
@@ -1,6 +1,12 @@
---- ruby/Gemfile.orig 2021-11-19 08:14:34 UTC
+--- ruby/Gemfile.orig 2021-12-21 14:02:19 UTC
+++ ruby/Gemfile
-@@ -7,7 +7,7 @@ gem 'activesupport', '~> 6.1.4.1'
+@@ -2,12 +2,12 @@ source 'https://rubygems.org'
+
+ gem 'rugged', '~> 1.2'
+ gem 'github-linguist', '~> 7.12', require: 'linguist'
+-gem 'gitlab-markup', '~> 1.7.1'
++gem 'gitlab-markup', '~> 1.8.0'
+ gem 'activesupport', '~> 6.1.4.1'
gem 'rdoc', '~> 6.0'
gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.1', require: false
gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false
@@ -9,13 +15,12 @@
gem 'sentry-raven', '~> 3.0', require: false
gem 'faraday', '~> 1.0'
gem 'rbtrace', require: false
-@@ -19,15 +19,5 @@ gem 'gitlab-labkit', '~> 0.21.1'
+@@ -19,23 +19,4 @@ gem 'gitlab-labkit', '~> 0.21.1'
# This version needs to be in sync with GitLab CE/EE
gem 'licensee', '~> 9.14.1'
-gem 'google-protobuf', '~> 3.17.0'
-+gem 'google-protobuf', '~> 3.19.0'
-
+-
-group :development, :test do
- gem 'rubocop', '~> 0.69', require: false
- gem 'rspec', require: false
@@ -26,3 +31,12 @@
-
- gem 'grpc-tools', '= 1.30.2'
-end
+-
+-# Gems required in omnibus-gitlab pipeline
+-group :development, :test, :omnibus do
+- # Using a fork until https://github.com/pivotal/LicenseFinder/pull/816 is
+- # resolved. For details, check discussion in
+- # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74881
+- gem 'gitlab-license_finder', require: false
+-end
++gem 'google-protobuf', '~> 3.19.0'