summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keiser <john@johnkeiser.com>2016-06-06 16:45:29 -0700
committerJohn Keiser <john@johnkeiser.com>2016-06-06 16:45:29 -0700
commit1d1d3b71cf5dc4cde20e89b68402c69bac7adda3 (patch)
treec7c83b732f9437cb262d7068a8909b8c7dd156e9
parent059c2bc6e4ab8f49296abb4e08edbaae700b1308 (diff)
downloadchef-jk/install-rake.tar.gz
Ensure we install rake in CI (version bump)jk/install-rake
-rw-r--r--Gemfile2
-rwxr-xr-xci/bundle_install.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index c20549012c..40d608e66b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,7 +13,7 @@ gem "chef", path: "."
gem "chef-config", path: File.expand_path("../chef-config", __FILE__) if File.exist?(File.expand_path("../chef-config", __FILE__))
# Ensure that we can always install rake, regardless of gem groups
-gem "rake"
+gem "rake", group: [ :default, :omnibus_package, :development ]
gem "bundler"
gem "cheffish"
diff --git a/ci/bundle_install.sh b/ci/bundle_install.sh
index c4b23001a6..37c5db9068 100755
--- a/ci/bundle_install.sh
+++ b/ci/bundle_install.sh
@@ -5,5 +5,5 @@ set -evx
gem environment
bundler_version=$(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
gem install bundler -v $bundler_version --user-install
-export BUNDLE_WITHOUT=default:omnibus_package:development:test:pry:integration:docgen:maintenance:changelog:travis:aix:bsd:linux:mac_os_x:solaris:windows
+export BUNDLE_WITHOUT=default:omnibus_package:test:pry:integration:docgen:maintenance:changelog:travis:aix:bsd:linux:mac_os_x:solaris:windows
bundle _${bundler_version}_ install