diff options
author | Tim Smith <tsmith@chef.io> | 2020-12-11 16:11:50 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-11 16:11:50 -0800 |
commit | 5335af31169969581a36a8941d147ff091d0ee27 (patch) | |
tree | d4e7c4b800bc8ba1e6db3c45d8e7a123583bf452 /docs | |
parent | d72219f19de628b9de7463df0f42e5d813511eeb (diff) | |
download | chef-5335af31169969581a36a8941d147ff091d0ee27.tar.gz |
Update bumping_the_major_version.md
Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to 'docs')
-rw-r--r-- | docs/dev/how_to/bumping_the_major_version.md | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/docs/dev/how_to/bumping_the_major_version.md b/docs/dev/how_to/bumping_the_major_version.md index ff93f5bcf6..b34e7b0a2c 100644 --- a/docs/dev/how_to/bumping_the_major_version.md +++ b/docs/dev/how_to/bumping_the_major_version.md @@ -8,18 +8,20 @@ Chef consumes Ohai from GitHub as both a runtime dependency and a testing depend ### Create a new stable branch of Ohai -On your local machine fork the current master branch to a new stable branch. For example: `git checkout -b 15-stable`. You'll then want to edit the Expeditor config.yml file to update the branch configs like this: +1. Edit the Expeditor config for the new branch, which you'll create shortly: -https://github.com/chef/ohai/commit/ad208165619425dd7886b2de3f168b49ded25146 + - Example config change commit: https://github.com/chef/ohai/commit/1ad8c5946606a7f08ffb841e3682ae2d4991077f -With the expeditor config complete push the branch `git push --set-upstream origin 15-stable` +2. On your local machine fork the current master branch to a new stable branch. For example: `git checkout -b 16-stable`. + +3. Push the branch `git push --set-upstream origin 16-stable` ### Bump Ohai master to the new major version -Create a PR which: +Starting from the master branch create a PR which: - Edits the `VERSION` file in the root of the repository to the new major release -- Updates the `chef-config` dependency to allow for the new major release of Chef Infra in `ohai.gemspec` +- Updates the `chef-config` and `chef-utils` dependencies to allow for the new major release of Chef Infra in `ohai.gemspec` ## Fork Chef master to a stable branch |