Difference between revisions of "User:Bitmap/Beta Cycle"

From MusicBrainz Wiki
(Proposed changes to beta cycle)
(Clarify when code is merged to master/beta)
Line 16: Line 16:
 
=== 5. Merge code to master. ===
 
=== 5. Merge code to master. ===
  
=== 6. Is the code fixing an issue not affecting the production branch? ===
+
=== 6. Is the code fixing an issue affecting master but not beta? ===
* Yes: Go to step 8.
+
* Yes: Close ticket as "Fixed". Go to step 12.
 
* No: Continue.
 
* No: Continue.
  
=== 7. Is the next release more than 7 days away? ===
+
=== 8. Is the code fixing an issue affecting beta but not production? ===
 +
* Yes: Go to step 10.
 +
* No: Continue.
 +
 
 +
=== 9. Is the next release more than 7 days away? ===
 
* Yes: Continue.
 
* Yes: Continue.
* No: Go to step 10.
+
* No: Go to step 12.
  
=== 8. Merge code to beta. ===
+
=== 10. Merge code to beta. ===
  
=== 9. Is the code fixing an issue not affecting the production branch? ===
+
=== 11. Is the code fixing an issue affecting beta but not production? ===
 
* Yes: Close ticket as "Fixed".
 
* Yes: Close ticket as "Fixed".
 
* No: Change ticket status to "In Beta Testing".
 
* No: Change ticket status to "In Beta Testing".
  
=== 10. Is it time to release? ===
+
=== 12. Is it time to release? ===
 
* Yes: Continue.
 
* Yes: Continue.
 
* No: Stop. Go fix something else.
 
* No: Stop. Go fix something else.
  
=== 11. Merge beta into production. ===
+
=== 13. Merge beta into production. ===
 
* Tag the release from the production branch.
 
* Tag the release from the production branch.
  
=== 12. Merge master into beta. ===
+
=== 14. Merge master into beta. ===

Revision as of 23:41, 27 November 2015

Note: This process does not apply to patches that require schema changes, or that need to be hot-fixed.

1. Write code.

2. Does the code need reviewing?

  • Yes: Continue.
  • No: Go to step 5.

3. Submit code for review.

  • Change ticket status to "In Review".

4. Has the code passed code review?

  • Yes: Continue.
  • No: Fix bugs. Go back to step 1.

5. Merge code to master.

6. Is the code fixing an issue affecting master but not beta?

  • Yes: Close ticket as "Fixed". Go to step 12.
  • No: Continue.

8. Is the code fixing an issue affecting beta but not production?

  • Yes: Go to step 10.
  • No: Continue.

9. Is the next release more than 7 days away?

  • Yes: Continue.
  • No: Go to step 12.

10. Merge code to beta.

11. Is the code fixing an issue affecting beta but not production?

  • Yes: Close ticket as "Fixed".
  • No: Change ticket status to "In Beta Testing".

12. Is it time to release?

  • Yes: Continue.
  • No: Stop. Go fix something else.

13. Merge beta into production.

  • Tag the release from the production branch.

14. Merge master into beta.