summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Duffield <tom@chef.io>2016-11-07 13:58:08 -0600
committerTom Duffield <tom@chef.io>2016-11-09 12:59:09 -0600
commit439b74cb6e333167fac2a00b43b49d4cf15b9d1d (patch)
treef704140aa9db914f7f252bb904b493d6a1589725
parentf84b6352a347b823b82d2c5f8e3e3905d6948221 (diff)
downloadchef-439b74cb6e333167fac2a00b43b49d4cf15b9d1d.tar.gz
Update the changelog when the version is bumped by CI
Signed-off-by: Tom Duffield <tom@chef.io>
-rw-r--r--README.md3
-rwxr-xr-xci/bundle_install.sh2
-rwxr-xr-xci/version_bump.sh1
3 files changed, 4 insertions, 2 deletions
diff --git a/README.md b/README.md
index db647f65eb..7995cc50ad 100644
--- a/README.md
+++ b/README.md
@@ -157,7 +157,8 @@ Whenever a change is checked in to `master`, the patch version of `chef` is bump
1. Bumps the patch version in `lib/chef/version.rb` (e.g. 0.9.14 -> 0.9.15).
2. Runs `rake bundle:install` to update the `Gemfile.lock` to include the new version.
-3. Pushes to `master` and submits a new build to Chef's Jenkins cluster.
+3. Runs `rake changelog:update` to update the `CHANGELOG.md`.
+4. Pushes to `master` and submits a new build to Chef's Jenkins cluster.
## Bumping the minor version of Chef
diff --git a/ci/bundle_install.sh b/ci/bundle_install.sh
index 6c6d76dc5d..7f90f74964 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 --conservative
-export BUNDLE_WITHOUT=default:omnibus_package: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:travis:aix:bsd:linux:mac_os_x:solaris:windows
bundle _${bundler_version}_ install
diff --git a/ci/version_bump.sh b/ci/version_bump.sh
index dd53cebfd5..147442666a 100755
--- a/ci/version_bump.sh
+++ b/ci/version_bump.sh
@@ -5,5 +5,6 @@ set -evx
. ci/bundle_install.sh
bundle exec rake version:bump
+bundle exec rake changelog:update
git checkout .bundle/config