Skip to content

Commit 5d5e2b0

Browse files
authored
Merge pull request gocd#12318 from chadlwilson/protobuf-piun
Lock google-protobuf at < 3.25.0
2 parents c3fd231 + 7bdd22d commit 5d5e2b0

2 files changed

Lines changed: 4 additions & 8 deletions

File tree

server/src/main/webapp/WEB-INF/rails/Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ platforms :jruby do
1414
# See https://github.com/sass/sassc-ruby/pull/233
1515
gem 'sassc', github: 'sass/sassc-ruby', ref: 'refs/pull/233/head'
1616
gem 'sassc-embedded'
17+
gem 'google-protobuf', '< 3.25.0'
1718

1819
gem 'js-routes'
1920
gem 'ts_routes'

server/src/main/webapp/WEB-INF/rails/Gemfile.lock

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,16 +85,10 @@ GEM
8585
date (3.3.4-java)
8686
diff-lcs (1.5.0)
8787
erubi (1.12.0)
88-
ffi (1.16.3-java)
89-
ffi-compiler (1.0.1)
90-
ffi (>= 1.0.0)
91-
rake
9288
globalid (1.2.1)
9389
activesupport (>= 6.1)
94-
google-protobuf (3.25.1-java)
95-
ffi (~> 1)
96-
ffi-compiler (~> 1)
97-
google-protobuf (3.25.1-x86_64-linux)
90+
google-protobuf (3.24.4-java)
91+
google-protobuf (3.24.4-x86_64-linux)
9892
i18n (1.14.1)
9993
concurrent-ruby (~> 1.0)
10094
js-routes (1.4.14)
@@ -231,6 +225,7 @@ PLATFORMS
231225

232226
DEPENDENCIES
233227
capybara
228+
google-protobuf (< 3.25.0)
234229
js-routes
235230
rails
236231
rails-controller-testing

0 commit comments

Comments
 (0)