diff options
| author | Tim Smith <tsmith@chef.io> | 2019-04-08 21:16:53 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith@chef.io> | 2019-04-23 16:53:22 -0700 |
| commit | a45f6a5acfd1dbf62fdd71002c6a279806f016ee (patch) | |
| tree | 1178bdd662d15f17633ade062a63c007a90e2a11 /README.md | |
| parent | aa5560b99bbbf8b43ae20da511a5168a3d41ad0e (diff) | |
| download | chef-a45f6a5acfd1dbf62fdd71002c6a279806f016ee.tar.gz | |
More and expand more dev docs
Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 27 |
1 files changed, 0 insertions, 27 deletions
@@ -85,33 +85,6 @@ Whenever a change is checked in to `master`, the patch version of `chef` is bump 2. Updates the changelog with the new pull request and current point release 3. Pushes to `master` and submits a new build to Chef's Jenkins cluster. -## Bumping the minor version of Chef - -After each "official" stable release we need to bump the minor version. To do this: - -1. Run `bundle exec rake version:bump_minor` - -Submit a PR with the changes made by the above. - -## Branch Structure - -We develop and ship the current release of Chef off the master branch of this repository. Our goal is that master should always be in a shipable state. Previous stable releases of Chef are developed on their own branches named by the major version (ex: chef-13 or chef-12). We do not perform direct development on these stable branches except to resolve build failures. Instead we backport fixes from our master branch to these stable branches. Stable branches receive critical bugfixes and security releases and stable Chef releases are made as necessary for security purposes. - -## Backporting Fixes to Stable Releases - -If there is a critical fix you believe should be backported from master to a stable branch please follow these steps to backport your change: - -1. Ask in the #chef-dev channel on [Chef Community Slack](https://community-slack.chef.io/) if this is an appropriate change to backport. -3. Inspect the Git history and find the `SHA`(s) associated with the fix. -4. Backport the fix to a branch via cherry-pick: - 1. Check out the stable release branch: `git checkout chef-13` - 1. Create a branch for your backport: `git checkout -b my_great_bug_packport` - 2. Cherry Pick the SHA with the fix: `git cherry-pick SHA` - 3. Address any conflicts (if necessary) - 5. Push the new branch to your origin: `git push origin` -5. Open a PR for your backport - 1. The PR title should be `Backport: ORIGINAL_PR_TEXT` - 2. The description should link to the original PR and include a description of why it needs to be backported ## Component Versions |