You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

108 lines
3.7 KiB

  1. # Breaking Changes
  2. This document describes QMK's Breaking Change process. A Breaking Change is any change which modifies how QMK behaves in a way that in incompatible or potentially dangerous. We limit these changes so that users can have confidence that updating their QMK tree will not break their keymaps.
  3. The breaking change period is when we will merge PR's that change QMK in dangerous or unexpected ways. There is a built-in period of testing so we are confident that any problems caused are rare or unable to be predicted.
  4. ## What has been included in past Breaking Changes?
  5. * [2020 Feb 29](ChangeLog/20200229.md)
  6. * [2019 Aug 30](ChangeLog/20190830.md)
  7. ## When is the next Breaking Change?
  8. The next Breaking Change is scheduled for May 30, 2020.
  9. ### Important Dates
  10. * [x] 2020 Feb 29 - `future` is created. It will be rebased weekly.
  11. * [ ] 2020 May 2 - `future` closed to new PR's.
  12. * [ ] 2020 May 2 - Call for testers.
  13. * [ ] 2020 May 28 - `master` is locked, no PR's merged.
  14. * [ ] 2020 May 30 - Merge `future` to `master`.
  15. * [ ] 2020 May 30 - `master` is unlocked. PR's can be merged again.
  16. ## What changes will be included?
  17. To see a list of breaking change candidates you can look at the [`breaking_change` label](https://github.com/qmk/qmk_firmware/pulls?q=is%3Aopen+label%3Abreaking_change+is%3Apr). New changes might be added between now and when `future` is closed, and a PR with that label applied is not guaranteed to be merged.
  18. If you want your breaking change to be included in this round you need to create a PR with the `breaking_change` label and have it accepted before `future` closes. After `future` closes no new breaking changes will be accepted.
  19. Criteria for acceptance:
  20. * PR is complete and ready to merge
  21. * PR has a ChangeLog
  22. # Checklists
  23. This section documents various processes we use when running the Breaking Changes process.
  24. ## Rebase `future` from `master`
  25. This is run every Friday while `future` is open.
  26. Process:
  27. ```
  28. cd qmk_firmware
  29. git checkout master
  30. git pull --ff-only
  31. git checkout future
  32. git rebase master
  33. git push --force
  34. ```
  35. ## Creating the `future` branch
  36. This happens immediately after the previous `future` branch is merged.
  37. * `qmk_firmware` git commands
  38. * [ ] `git checkout master`
  39. * [ ] `git pull --ff-only`
  40. * [ ] `git checkout -b future`
  41. * [ ] Edit `readme.md`
  42. * [ ] Add a big notice at the top that this is a testing branch.
  43. * [ ] Include a link to this document
  44. * [ ] `git commit -m 'Branch point for <DATE> Breaking Change'`
  45. * [ ] `git tag breakpoint_<YYYY>_<MM>_<DD>`
  46. * [ ] `git tag <next_version>` # Prevent the breakpoint tag from confusing version incrementing
  47. * [ ] `git push origin future`
  48. * [ ] `git push --tags`
  49. ## 4 Weeks Before Merge
  50. * `future` is now closed to new PR's, only fixes for current PR's may be merged
  51. * Post call for testers
  52. * [ ] Discord
  53. * [ ] GitHub PR
  54. * [ ] https://reddit.com/r/olkb
  55. ## 1 Week Before Merge
  56. * Announce that master will be closed from <2 Days Before> to <Day of Merge>
  57. * [ ] Discord
  58. * [ ] GitHub PR
  59. * [ ] https://reddit.com/r/olkb
  60. ## 2 Days Before Merge
  61. * Announce that master is closed for 2 days
  62. * [ ] Discord
  63. * [ ] GitHub PR
  64. * [ ] https://reddit.com/r/olkb
  65. ## Day Of Merge
  66. * `qmk_firmware` git commands
  67. * [ ] `git checkout future`
  68. * [ ] `git pull --ff-only`
  69. * [ ] `git rebase origin/master`
  70. * [ ] Edit `readme.md`
  71. * [ ] Remove the notes about `future`
  72. * [ ] Roll up the ChangeLog into one file.
  73. * [ ] `git commit -m 'Merge point for <DATE> Breaking Change'`
  74. * [ ] `git push origin future`
  75. * Github Actions
  76. * [ ] Create a PR for `future`
  77. * [ ] Make sure travis comes back clean
  78. * [ ] Merge `future` PR