summaryrefslogtreecommitdiff
path: root/omnibus
diff options
context:
space:
mode:
authortyler-ball <tyleraball@gmail.com>2016-01-21 12:14:19 -0700
committertyler-ball <tyleraball@gmail.com>2016-01-21 12:14:19 -0700
commit5233fe583b601bc9fbaf4751a47858292bb11d15 (patch)
tree19e9019dde5deac95cfe354640bebfc8f50d74c7 /omnibus
parent5bd62d64eaa8dde65188aba21620f8f0fd76a38f (diff)
downloadchef-5233fe583b601bc9fbaf4751a47858292bb11d15.tar.gz
Solaris builds are failing because bundler-audit depends on Thor, which has a filename with a space in it. Bundler-audit is only needed for Travis so putting it into its own gem group and excluding it from the omnibus build.
Diffstat (limited to 'omnibus')
-rw-r--r--omnibus/Gemfile2
-rw-r--r--omnibus/Gemfile.lock3
2 files changed, 3 insertions, 2 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index 12001d1c17..8b2d627972 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -1,7 +1,7 @@
source "https://rubygems.org"
gem "omnibus", github: "chef/omnibus"
-gem "omnibus-software", github: "chef/omnibus-software"
+gem "omnibus-software", github: "chef/omnibus-software", branch: "tball/no_more_thor"
# This development group is installed by default when you run `bundle install`,
# but if you are using Omnibus in a CI-based infrastructure, you do not need
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 93b0a2016b..98ba98bcb4 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,6 +1,7 @@
GIT
remote: git://github.com/chef/omnibus-software.git
- revision: e9675680662c8420b980d2d6067a93212d898f67
+ revision: 2d3bebe8b83666564ecbb93d9f1a0d23ba62f9ee
+ branch: tball/no_more_thor
specs:
omnibus-software (4.0.0)