darkkirb/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update the breaking changes process so we always have a future branch (#6785)

Browse source
This commit is contained in:
skullydazed 2019-09-21 11:58:06 -07:00 committed by GitHub
parent 42bf60751e
commit 0e96068d23
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
docs/breaking_changes.md
View file

@ -14,7 +14,7 @@ The next Breaking Change is scheduled for Nov 29.
### Important Dates ### Important Dates
* [ ] 2019 Oct 04 - `future` is created. It will be rebased weekly. * [x] 2019 Sep 21 - `future` is created. It will be rebased weekly.
* [ ] 2019 Nov 01 - `future` closed to new PR's. * [ ] 2019 Nov 01 - `future` closed to new PR's.
* [ ] 2019 Nov 01 - Call for testers. * [ ] 2019 Nov 01 - Call for testers.
* [ ] 2019 Nov 27 - `master` is locked, no PR's merged. * [ ] 2019 Nov 27 - `master` is locked, no PR's merged.
@ -51,7 +51,9 @@ git rebase master
git push --force git push --force
``` ```
## 8 Weeks Before Merge ## Creating the `future` branch
This happens immediately after the previous `future` branch is merged.
* `qmk_firmware` git commands * `qmk_firmware` git commands
* [ ] `git checkout master` * [ ] `git checkout master`
@ -65,9 +67,6 @@ git push --force
* [ ] `git tag <next_version>` # Prevent the breakpoint tag from confusing version incrementing * [ ] `git tag <next_version>` # Prevent the breakpoint tag from confusing version incrementing
* [ ] `git push origin future` * [ ] `git push origin future`
* [ ] `git push --tags` * [ ] `git push --tags`
* GitHub Actions
* [ ] Switch all [breaking_change PR's](https://github.com/qmk/qmk_firmware/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aopen+label%3Abreaking_change) to `future`
* [ ] Any that have a ChangeLog entry may be merged immediately.
## 4 Weeks Before Merge ## 4 Weeks Before Merge