Merge pull request chef#5002 from chef/jk/install-less-stuff

Install fewer binary dependencies and dependencies in general
mikedodge04 · Jun 6, 2016 · 059c2bc · 059c2bc
2 parents 7d7f26e + 9e4dbf3
commit 059c2bc
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/ci/bundle_install.sh b/ci/bundle_install.sh
@@ -5,4 +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
 bundle _${bundler_version}_ install
diff --git a/ci/dependency_update.sh b/ci/dependency_update.sh
@@ -5,3 +5,5 @@ set -evx
 . ci/bundle_install.sh
 
 bundle exec rake dependencies
+
+git checkout .bundle/config
diff --git a/ci/version_bump.sh b/ci/version_bump.sh
@@ -5,3 +5,5 @@ set -evx
 . ci/bundle_install.sh
 
 bundle exec rake version:bump
+
+git checkout .bundle/config
diff --git a/ci/version_show.sh b/ci/version_show.sh
@@ -1,7 +1,3 @@
 #!/bin/sh
 
-set -evx
-
-. ci/bundle_install.sh
-
-bundle exec rake version:show
+cat VERSION
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,3 +5,5 @@ set -evx
		. ci/bundle_install.sh

		bundle exec rake dependencies

		git checkout .bundle/config