diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2023-01-27 14:24:19 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2023-01-27 14:24:19 +0300 |
| commit | 1272cfa77b7a3960ec1595d7fa9fe5b96246f0df (patch) | |
| tree | 1a549216fb9e00fd354d7b6a32cd215ea55cac41 | |
| parent | 83408c049aa30b2b248a497e6cf8f2e6ee5a0392 (diff) | |
| parent | e917b3d3a8d4e680be8899dc974b12357616b8cf (diff) | |
Merge branch 'wc/make-protogem-install' into 'master'
Makefile: Install protogem dependencies
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5296
Merged-by: Patrick Steinhardt <psteinhardt@gitlab.com>
Approved-by: Patrick Steinhardt <psteinhardt@gitlab.com>
Co-authored-by: Will Chandler <wchandler@gitlab.com>
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | ruby/Gemfile | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -494,6 +494,7 @@ lint-proto: ${PROTOC} ${PROTOLINT} ${PROTOC_GEN_GITALY_LINT} .PHONY: build-proto-gem ## Build the Ruby Gem that contains Gitaly's Protobuf definitons. build-proto-gem: + ${Q}cd "${SOURCE_DIR}"/tools/protogem && bundle install ${Q}"${SOURCE_DIR}"/tools/protogem/build-proto-gem -o "${BUILD_DIR}/gitaly.gem" ${BUILD_GEM_OPTIONS} .PHONY: publish-proto-gem diff --git a/ruby/Gemfile b/ruby/Gemfile index 17ed46af2..a00313725 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' gem 'rugged', '~> 1.2' gem 'gitlab-markup', '~> 1.7.1' gem 'activesupport', '~> 6.1.6.1' -gem 'grpc', '~> 1.42.0' # keep in lock-step with grpc-tools +gem 'grpc', '~> 1.42.0' # keep in lock-step with grpc-tools in ../tools/protogem gem 'sentry-raven', '~> 3.0', require: false gem 'rbtrace', require: false |