summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2019-06-24 20:11:50 -0700
committerTim Smith <tsmith84@gmail.com>2019-06-24 20:13:34 -0700
commit21cbf96d90d6a9b693640b9898afec44b03b9926 (patch)
tree0e95ea4e2fe32bb254e1de831af39d9a1a04a6d8
parent3f340d9ecbaaa610f62b21ea106b31d0ba162146 (diff)
downloadchef-ruby_prof.tar.gz
Pin to ruby-prof 0.17ruby_prof
ruby-prof 0.18 fails to load on Windows. See https://github.com/ruby-prof/ruby-prof/issues/255 Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock5
-rw-r--r--omnibus/Gemfile.lock2
3 files changed, 4 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile
index 5149e1427c..63a2672e5f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -45,7 +45,7 @@ end
# Everything except AIX
group(:ruby_prof) do
- gem "ruby-prof"
+ gem "ruby-prof","< 0.18" # 0.18 includes a x64-mingw32 gem, which doesn't load correctly. See https://github.com/ruby-prof/ruby-prof/issues/255
end
# Everything except AIX and Windows
diff --git a/Gemfile.lock b/Gemfile.lock
index 0d651ab703..cd4864cbdb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -300,8 +300,7 @@ GEM
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.4.0)
- 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)
rubyntlm (0.6.2)
@@ -436,7 +435,7 @@ DEPENDENCIES
rspec-expectations (~> 3.5)
rspec-mocks (~> 3.5)
rspec_junit_formatter (~> 0.2.0)
- ruby-prof
+ ruby-prof (< 0.18)
ruby-shadow
simplecov
webmock
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 1bdb7e9d80..19242db542 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -32,7 +32,7 @@ GEM
public_suffix (>= 2.0.2, < 4.0)
awesome_print (1.8.0)
aws-eventstream (1.0.3)
- aws-partitions (1.177.0)
+ aws-partitions (1.178.0)
aws-sdk-core (3.56.0)
aws-eventstream (~> 1.0, >= 1.0.2)
aws-partitions (~> 1.0)