diff options
| author | Tom Duffield <tom@chef.io> | 2017-02-10 21:35:14 -0600 |
|---|---|---|
| committer | Tom Duffield <tom@chef.io> | 2017-02-22 13:04:14 -0600 |
| commit | ef38cd3691bf3ecd08cd88c83b41611ebf95cd7e (patch) | |
| tree | 38ec3decad2db9b6f6c5e18b6fb2f1ab0fed948e /ci | |
| parent | 42445a55fe97a4c8c1b5b88b91b38e3f15babc61 (diff) | |
| download | chef-ef38cd3691bf3ecd08cd88c83b41611ebf95cd7e.tar.gz | |
Better handle version bumpingtduffield/update-version-bumping
Signed-off-by: Tom Duffield <tom@chef.io>
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/bundle_install.sh | 2 | ||||
| -rwxr-xr-x | ci/version_bump.sh | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/ci/bundle_install.sh b/ci/bundle_install.sh index 4eecec9f18..bb1d9694db 100755 --- a/ci/bundle_install.sh +++ b/ci/bundle_install.sh @@ -5,6 +5,6 @@ set -evx gem environment bundler_version=$(grep bundler omnibus_overrides.rb | cut -d'"' -f2) gem install bundler -v $bundler_version --user-install --conservative -# WITH: changelog (for version bumping and changelog creation) +# WITH: ci (for version bumping and changelog creation) export BUNDLE_WITHOUT=omnibus_package:test:pry:integration:docgen:maintenance:travis:aix:bsd:linux:mac_os_x:solaris:windows:development:travis bundle _${bundler_version}_ install diff --git a/ci/version_bump.sh b/ci/version_bump.sh index ed2229ecc3..4b5ba5236b 100755 --- a/ci/version_bump.sh +++ b/ci/version_bump.sh @@ -6,8 +6,6 @@ export LANG=en_US.UTF-8 . ci/bundle_install.sh -bundle exec rake version:bump -bundle exec rake changelog || true -bundle exec rake update_dockerfile +bundle exec rake ci_version_bump git checkout .bundle/config |