summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2020-02-25 12:25:18 -0800
committerTim Smith <tsmith84@gmail.com>2020-03-16 15:50:33 -0700
commit3f5a409f97e19ac083dd1606e0eff0a82744fcc1 (patch)
tree6e5f011106e153ec7f1786ad421dbe926858e9cb
parent6939ab64221952f0e2cc5e1ff4b680e3ff5966c1 (diff)
downloadchef-3f5a409f97e19ac083dd1606e0eff0a82744fcc1.tar.gz
drop ruby-prof down to 1.2.0 for centos6
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r--Gemfile3
-rw-r--r--Gemfile.lock5
2 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index 1ba95ad85d..e41d41e4c7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -46,7 +46,8 @@ end
# Everything except AIX
group(:ruby_prof) do
- gem "ruby-prof"
+ # ruby-prof 1.3.0 does not compile on our centos6 builders/kitchen testers
+ gem "ruby-prof", "< 1.3.0"
end
# Everything except AIX and Windows
diff --git a/Gemfile.lock b/Gemfile.lock
index 47c2eb9b98..4d5f17ce6f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -336,8 +336,7 @@ GEM
rexml
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7)
- ruby-prof (1.3.1)
- ruby-prof (1.3.1-x64-mingw32)
+ ruby-prof (1.2.0)
ruby-progressbar (1.10.1)
ruby-shadow (2.5.0)
rubyntlm (0.6.2)
@@ -479,7 +478,7 @@ DEPENDENCIES
rspec-expectations (~> 3.5)
rspec-mocks (~> 3.5)
rspec_junit_formatter (~> 0.2.0)
- ruby-prof
+ ruby-prof (< 1.3.0)
ruby-shadow
simplecov
webmock