Merge branch 'master' into development

ontoportal-lirmm · Sep 9, 2024 · 5c990e1 · 5c990e1
2 parents 16fedb9 + 54424ed
commit 5c990e1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -69,7 +69,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7.6 # Not needed with a .ruby-version file
+          ruby-version: 2.7.8 # Not needed with a .ruby-version file
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
       - name: get-deployment-config
         uses: actions/checkout@v3

diff --git a/Gemfile b/Gemfile
@@ -16,7 +16,7 @@ gem 'sinatra-contrib', '~> 1.0'
 gem 'request_store'
 gem 'parallel'
 gem 'json-ld'
-
+gem 'google-protobuf', '3.25.3'
 
 # Rack middleware
 gem 'ffi'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -197,7 +197,7 @@ GEM
     google-cloud-env (2.1.1)
       faraday (>= 1.0, < 3.a)
     google-cloud-errors (1.4.0)
-    google-protobuf (3.25.4)
+    google-protobuf (3.25.3-x86_64-linux)
     googleapis-common-protos (1.6.0)
       google-protobuf (>= 3.18, < 5.a)
       googleapis-common-protos-types (~> 1.7)
@@ -421,6 +421,7 @@ DEPENDENCIES
   faraday (~> 1.9)
   ffi
   goo!
+  google-protobuf (= 3.25.3)
   haml (~> 5.2.2)
   json-ld
   json-schema (~> 2.0)