Commit 5aeb9177 authored by Bob Van Landuyt's avatar Bob Van Landuyt 💬
Browse files

Merge branch 'mk-revert-grpc-update' into 'master' 

Downgrade grpc + tools to 1.30.2

See merge request gitlab-org/labkit-ruby!81
parents b772a8d6 d6d478b9

.gitlab-ci.yml

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ workflow: 
test:3.0:

  image: ruby:3.0

  <<: *test_definition

  allow_failure: true # until we resolve grpc compatibility, see https://gitlab.com/gitlab-org/labkit-ruby/-/merge_requests/81



test:2.7:

  image: ruby:2.7

gitlab-labkit.gemspec

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec| 
  # Please maintain alphabetical order for dependencies

  spec.add_runtime_dependency "actionpack", ">= 5.0.0", "< 7.0.0"

  spec.add_runtime_dependency "activesupport", ">= 5.0.0", "< 7.0.0"

  spec.add_runtime_dependency "grpc", "~> 1.38" # Be sure to update the "grpc-tools" dev_dependency too

  spec.add_runtime_dependency "grpc", "~> 1.30.2" # Be sure to update the "grpc-tools" dev_dependency too

  spec.add_runtime_dependency "jaeger-client", "~> 1.1"

  spec.add_runtime_dependency "opentracing", "~> 0.4"

  spec.add_runtime_dependency "pg_query", "~> 2.1"
@@ -31,7 +31,7 @@ Gem::Specification.new do |spec| 
  spec.add_development_dependency "excon", "~> 0.78.1"

  spec.add_development_dependency "faraday", "~> 1.2.0"

  spec.add_development_dependency "gitlab-styles", "~> 6.2.0"

  spec.add_development_dependency "grpc-tools", "~> 1.38"

  spec.add_development_dependency "grpc-tools", "~> 1.30.2"

  spec.add_development_dependency "httparty", "~> 0.17.3"

  spec.add_development_dependency "httpclient", "~> 2.8.3"

  spec.add_development_dependency "pry", "~> 0.12"