Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Update release deployment docs #20

Open
wants to merge 6 commits into
base: master
Choose a base branch
from

Conversation

marlowpayne
Copy link

@marlowpayne marlowpayne commented Aug 12, 2016

Changes

  • Releases should merge to master, then merge master into develop
  • Add clarity to merging commands to ensure that local code isn't outdated
  • Astro's release doc is long and has special cases. Use code style's release doc as reference instead
  • Remove some redundancy around creating GitHub releases

How to Test

  • Proofread doc changes

Todos:

  • Update Release Deployment doc's diagrams as necessary
  • +1

@@ -84,7 +84,10 @@ There's nothing special about that. Each developer follows the above [Develop a
the release.

```
$ git checkout master
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added these extra steps to ensure that branches are up to date before merging.

@jansepar
Copy link
Contributor

We should be adding a point that "When merging a hotfix into master, and then master into develop, master should also be merged into any currently open release branches."

@highruned
Copy link
Contributor

Nothing blocking from me. Looks solid! 👍

@jeremywiebe
Copy link
Contributor

It looks like our diagrams for the Release Deployment workflow are still showing merging from the release/hotfix into develop. Maybe we put that on a TODO list, but it's certainly affected by the changes to this PR.

@mikenikles
Copy link
Contributor

@jeremywiebe Do you know who owns the image files for the diagrams? I only see png files and can't edit them to reflect the changes in this PR.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Development

Successfully merging this pull request may close these issues.

7 participants