summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2020-02-25 12:25:18 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2020-02-25 12:25:18 -0800
commited527d2fd6999a540f7ac183efefe40dcc1762e7 (patch)
treec782550d7a8ba77712b4284caa865ac20a7dfd63
parent9b31e2d155ef28cb1eea25b236486a26829ccf2d (diff)
downloadchef-lcg/fix-kitchen-tests.tar.gz
drop ruby-prof down to 1.2.0 for centos6lcg/fix-kitchen-tests
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 8643a7d415..1d99d59198 100644
--- a/Gemfile
+++ b/Gemfile
@@ -45,7 +45,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 5531e7393b..b4b0f538f9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -336,8 +336,7 @@ GEM
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7)
- ruby-prof (1.3.0)
- ruby-prof (1.3.0-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