aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorskullydazed <skullydazed@users.noreply.github.com>2019-09-21 11:58:06 -0700
committerGitHub <noreply@github.com>2019-09-21 11:58:06 -0700
commit0e96068d2352a1895ee1426b90bd54e4e055a672 (patch)
tree87d0e4742a311e9290fd2c14844c23a47dd238db
parent42bf60751e1b1b65083e89b8b248ff282b3d5213 (diff)
downloadfirmware-0e96068d2352a1895ee1426b90bd54e4e055a672.tar.gz
firmware-0e96068d2352a1895ee1426b90bd54e4e055a672.tar.bz2
firmware-0e96068d2352a1895ee1426b90bd54e4e055a672.zip
Update the breaking changes process so we always have a future branch (#6785)
-rw-r--r--docs/breaking_changes.md9
1 files changed, 4 insertions, 5 deletions
diff --git a/docs/breaking_changes.md b/docs/breaking_changes.md
index b193b12da..b5bcb7a1c 100644
--- a/docs/breaking_changes.md
+++ b/docs/breaking_changes.md
@@ -14,7 +14,7 @@ The next Breaking Change is scheduled for Nov 29.
### 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 - Call for testers.
* [ ] 2019 Nov 27 - `master` is locked, no PR's merged.
@@ -51,7 +51,9 @@ git rebase master
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
* [ ] `git checkout master`
@@ -65,9 +67,6 @@ git push --force
* [ ] `git tag <next_version>` # Prevent the breakpoint tag from confusing version incrementing
* [ ] `git push origin future`
* [ ] `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