diff options
| author | Tim Smith <tsmith@chef.io> | 2019-05-29 21:38:29 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-29 21:38:29 -0700 |
| commit | f7383fee35e7df412b4bc4e7c96df578581bee18 (patch) | |
| tree | 003d9a97d36e36c9ddcf26124a0aa0e294d6ab44 | |
| parent | d92838f9453d11daa9eb8c3394f7ae6b55b70c53 (diff) | |
| parent | dabbbe4ede7987fae342cf81495c2f8a5521f4bd (diff) | |
| download | chef-f7383fee35e7df412b4bc4e7c96df578581bee18.tar.gz | |
Merge pull request #8615 from chef/ruby_prof_14
Pin ruby_prof to < 0.18 to prevent appveyor failures
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 5 |
2 files changed, 3 insertions, 4 deletions
@@ -30,7 +30,7 @@ end # Everything except AIX group(:ruby_prof) do - gem "ruby-prof" + gem "ruby-prof", "< 0.18.0" # 0.18 breaks appveyor tests end # Everything except AIX and Windows diff --git a/Gemfile.lock b/Gemfile.lock index 809f6cd6ac..88dfd35f00 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -255,8 +255,7 @@ GEM rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) - ruby-prof (0.18.0) - ruby-prof (0.18.0-x64-mingw32) + ruby-prof (0.17.0) ruby-progressbar (1.10.1) ruby-shadow (2.5.0) rubyzip (1.2.3) @@ -370,7 +369,7 @@ DEPENDENCIES pry-stack_explorer rake (<= 12.3.0) rb-readline - ruby-prof + ruby-prof (< 0.18.0) ruby-shadow simplecov webmock |