diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2017-05-10 09:48:32 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2017-05-10 09:48:32 -0700 |
| commit | 153d49a0e5d3d6d7ec501dc2a42e1281ca16be71 (patch) | |
| tree | 3a3a1ef4b861bbb1c620bb80eb19c4e84c39892d | |
| parent | bb6682036fcdb119fa1f7701543eec191c08170b (diff) | |
| download | chef-153d49a0e5d3d6d7ec501dc2a42e1281ca16be71.tar.gz | |
remove bundle_install.sh
doesn't matter, and if it did we should use the actual bundler
trampolining.
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
| -rwxr-xr-x | ci/bundle_install.sh | 12 | ||||
| -rwxr-xr-x | ci/dependency_update.sh | 2 | ||||
| -rwxr-xr-x | ci/version_bump.sh | 2 |
3 files changed, 2 insertions, 14 deletions
diff --git a/ci/bundle_install.sh b/ci/bundle_install.sh deleted file mode 100755 index 80e56ecbd2..0000000000 --- a/ci/bundle_install.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# FIXME: someone document what actually calls this -# FIXME: is this really the best place for this or should it go in the rake tasks? - -set -evx - -gem environment -omnibus_bundler=$(grep bundler omnibus_overrides.rb | cut -d'"' -f2) -gem uninstall bundler -a -x -gem install bundler -v $omnibus_bundler --user-install --conservative -# WITH: ci (for version bumping and changelog creation) -bundle install --without omnibus_package test pry integration docgen maintenance travis aix bsd linux mac_os_x solaris windows development diff --git a/ci/dependency_update.sh b/ci/dependency_update.sh index 7930b864d8..100e2513ec 100755 --- a/ci/dependency_update.sh +++ b/ci/dependency_update.sh @@ -4,6 +4,6 @@ set -evx -. ci/bundle_install.sh +bundle install --without omnibus_package test pry integration docgen maintenance travis aix bsd linux mac_os_x solaris windows development bundle exec rake dependencies_ci diff --git a/ci/version_bump.sh b/ci/version_bump.sh index 9e4c85ebc8..f0a635843f 100755 --- a/ci/version_bump.sh +++ b/ci/version_bump.sh @@ -6,6 +6,6 @@ set -evx export LANG=en_US.UTF-8 -. ci/bundle_install.sh +bundle install --without omnibus_package test pry integration docgen maintenance travis aix bsd linux mac_os_x solaris windows development bundle exec rake ci_version_bump |