diff options
author | Tim Smith <tsmith@chef.io> | 2018-10-25 15:26:24 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-25 15:26:24 -0700 |
commit | 21511228714a084a15bc17016236b56a75dc41b0 (patch) | |
tree | 2046ea583d6d2655370c3a5135ffcf1d4f2c400a | |
parent | b93e098a56696e4a58f2928d494b5f429cad5b97 (diff) | |
parent | c9c35a9997d6ad9ecdbb0ee0a5f8bc7296b4ab40 (diff) | |
download | chef-21511228714a084a15bc17016236b56a75dc41b0.tar.gz |
Merge pull request #7779 from chef/rake
Pin rake to 12.3.0 to prevent installing 2 copies in our install
-rw-r--r-- | Gemfile | 5 | ||||
-rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -47,7 +47,10 @@ group(:ruby_shadow) do end group(:development, :test) do - gem "rake" + # we pin rake as a copy of rake is installed from the ruby source + # if you bump the ruby version you should confirm we don't end up with + # two rake gems installed again + gem "rake", "<= 12.3.0" gem "simplecov" gem "webmock" diff --git a/Gemfile.lock b/Gemfile.lock index 24a6bd8c19..cb2a48e0f6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -242,7 +242,7 @@ GEM websocket (~> 1.0) rack (2.0.5) rainbow (3.0.0) - rake (12.3.1) + rake (12.3.0) rb-readline (0.5.5) rspec (3.8.0) rspec-core (~> 3.8.0) @@ -368,7 +368,7 @@ DEPENDENCIES pry-byebug pry-remote pry-stack_explorer - rake + rake (<= 12.3.0) rb-readline ruby-prof ruby-shadow |