Browse Source

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
ThibG 1 month ago
parent
commit
1051de0165
2 changed files with 8 additions and 3 deletions
  1. 6
    1
      .circleci/config.yml
  2. 2
    2
      Gemfile.lock

+ 6
- 1
.circleci/config.yml View File

@@ -69,7 +69,12 @@ aliases:
69 69
         - *install_system_dependencies
70 70
         - run: ruby -e 'puts RUBY_VERSION' | tee /tmp/.ruby-version
71 71
         - *restore_ruby_dependencies
72
-        - run: bundle install --clean --jobs 16 --path ./vendor/bundle/ --retry 3 --with pam_authentication --without development production && bundle clean
72
+        - run: bundle config set clean 'true'
73
+        - run: bundle config set deployment 'true'
74
+        - run: bundle config set with 'pam_authentication'
75
+        - run: bundle config set without 'development production'
76
+        - run: bundle config set frozen 'true'
77
+        - run: bundle install --jobs 16 --retry 3 && bundle clean
73 78
         - save_cache:
74 79
             key: v2-ruby-dependencies-{{ checksum "/tmp/.ruby-version" }}-{{ checksum "Gemfile.lock" }}
75 80
             paths:

+ 2
- 2
Gemfile.lock View File

@@ -44,7 +44,7 @@ GEM
44 44
     actionpack (5.2.4.1)
45 45
       actionview (= 5.2.4.1)
46 46
       activesupport (= 5.2.4.1)
47
-      rack (~> 2.0, >= 2.1.2)
47
+      rack (~> 2.0, >= 2.0.8)
48 48
       rack-test (>= 0.6.3)
49 49
       rails-dom-testing (~> 2.0)
50 50
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
@@ -148,7 +148,7 @@ GEM
148 148
       addressable
149 149
       mini_mime (>= 0.1.3)
150 150
       nokogiri (~> 1.8)
151
-      rack (>= 2.1.2)
151
+      rack (>= 1.6.0)
152 152
       rack-test (>= 0.6.3)
153 153
       regexp_parser (~> 1.5)
154 154
       xpath (~> 3.2)

Loading…
Cancel
Save