diff options
| author | ThibG <thib@sitedethib.com> | 2020-01-28 18:50:44 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2020-01-28 18:50:44 +0100 |
| commit | 1051de0165e6e6555e8d27b90bb622cb0c4908b2 (patch) | |
| tree | 493b1d1a8da3190c64eed4d515419cb67e40c55a | |
| parent | 8071b71b9fe4b8fa6197cd8b6cb5148fc670005c (diff) | |
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
| -rw-r--r-- | .circleci/config.yml | 7 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 5b61b7453..3ba027d95 100644 --- 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 d78465c8f..75f2d4828 100644 --- 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) |