Fix Gemfile.lock (#12995)

* Use bundle install in deployment mode for Continuous Integration to catch Gemfile.lock issues

* Fix deprecation warnings

* Fix Gemfile.lock

* More changes to catch Gemfile.lock issues

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5b61b74536910576356484af030fe056f17cf38f..3ba027d953003c59d57d1ba91a1147f29ee674a6 100644 (file)
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -69,7 +69,12 @@ aliases:
         - *install_system_dependencies
         - run: ruby -e 'puts RUBY_VERSION' | tee /tmp/.ruby-version
         - *restore_ruby_dependencies
-        - run: bundle install --clean --jobs 16 --path ./vendor/bundle/ --retry 3 --with pam_authentication --without development production && bundle clean
+        - run: bundle config set clean 'true'
+        - run: bundle config set deployment 'true'
+        - run: bundle config set with 'pam_authentication'
+        - run: bundle config set without 'development production'
+        - run: bundle config set frozen 'true'
+        - run: bundle install --jobs 16 --retry 3 && bundle clean
         - save_cache:
             key: v2-ruby-dependencies-{{ checksum "/tmp/.ruby-version" }}-{{ checksum "Gemfile.lock" }}
             paths:

diff --git a/Gemfile.lock b/Gemfile.lock
index d78465c8fbd6df99bb0e856bb87e0ec500f99236..75f2d482882f2f1e917a29b180e120feca9505b2 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -44,7 +44,7 @@ GEM
     actionpack (5.2.4.1)
       actionview (= 5.2.4.1)
       activesupport (= 5.2.4.1)
-      rack (~> 2.0, >= 2.1.2)
+      rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
@@ -148,7 +148,7 @@ GEM
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
-      rack (>= 2.1.2)
+      rack (>= 1.6.0)
       rack-test (>= 0.6.3)
       regexp_parser (~> 1.5)
       xpath (~> 3.2)