diff options
| author | John Keiser <john@johnkeiser.com> | 2016-06-06 16:38:42 -0700 |
|---|---|---|
| committer | John Keiser <john@johnkeiser.com> | 2016-06-06 16:38:42 -0700 |
| commit | 059c2bc6e4ab8f49296abb4e08edbaae700b1308 (patch) | |
| tree | c7b20aeba8aa67fb91dc5af1e331ad9e9f68d460 | |
| parent | 7d7f26e3fef8110b159a009587afcd882c6adb81 (diff) | |
| parent | 9e4dbf391f62df449fbe8c99e3d1777cbb7f6ccf (diff) | |
| download | chef-059c2bc6e4ab8f49296abb4e08edbaae700b1308.tar.gz | |
Merge pull request #5002 from chef/jk/install-less-stuff
Install fewer binary dependencies and dependencies in general
| -rwxr-xr-x | ci/bundle_install.sh | 1 | ||||
| -rwxr-xr-x | ci/dependency_update.sh | 2 | ||||
| -rwxr-xr-x | ci/version_bump.sh | 2 | ||||
| -rwxr-xr-x | ci/version_show.sh | 6 |
4 files changed, 6 insertions, 5 deletions
diff --git a/ci/bundle_install.sh b/ci/bundle_install.sh index 519b0e4367..c4b23001a6 100755 --- 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 index 3ab0c611b6..9588652143 100755 --- 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 index bd365c712c..dd53cebfd5 100755 --- 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 index c8917f2036..5348f6f090 100755 --- 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 |