summaryrefslogtreecommitdiff
path: root/docs/breaking_changes.md
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2022-05-29 07:50:21 +1000
committerGitHub <noreply@github.com>2022-05-29 07:50:21 +1000
commitd0af56da3349052856b58d3d85759ac4b9022839 (patch)
tree4f0f8447ba81d40605e5dbe4d26de1c3203b6004 /docs/breaking_changes.md
parentebd402788346aa6e88bde1486b2a835684d40d39 (diff)
Breaking changes for 2022q2. (#17221)
Diffstat (limited to 'docs/breaking_changes.md')
-rw-r--r--docs/breaking_changes.md18
1 files changed, 9 insertions, 9 deletions
diff --git a/docs/breaking_changes.md b/docs/breaking_changes.md
index 375defe87d..981512cd4c 100644
--- a/docs/breaking_changes.md
+++ b/docs/breaking_changes.md
@@ -22,17 +22,17 @@ The breaking change period is when we will merge PR's that change QMK in dangero
22 22
23## When is the next Breaking Change? 23## When is the next Breaking Change?
24 24
25The next Breaking Change is scheduled for May 28, 2022. 25The next Breaking Change is scheduled for August 27, 2022.
26 26
27### Important Dates 27### Important Dates
28 28
29* [x] 2022 Feb 26 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions. 29* [x] 2022 May 28 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions.
30* [ ] 2022 Apr 31 - `develop` closed to new PR's. 30* [ ] 2022 Jul 31 - `develop` closed to new PR's.
31* [ ] 2022 Apr 31 - Call for testers. 31* [ ] 2022 Jul 31 - Call for testers.
32* [ ] 2022 May 14 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes 32* [ ] 2022 Aug 13 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes
33* [ ] 2022 May 26 - `master` is locked, no PR's merged. 33* [ ] 2022 Aug 25 - `master` is locked, no PR's merged.
34* [ ] 2022 May 28 - Merge `develop` to `master`. 34* [ ] 2022 Aug 27 - Merge `develop` to `master`.
35* [ ] 2022 May 28 - `master` is unlocked. PR's can be merged again. 35* [ ] 2022 Aug 27 - `master` is unlocked. PR's can be merged again.
36 36
37## What changes will be included? 37## What changes will be included?
38 38
@@ -43,7 +43,7 @@ If you want your breaking change to be included in this round you need to create
43Criteria for acceptance: 43Criteria for acceptance:
44 44
45* The PR is complete and ready to merge 45* The PR is complete and ready to merge
46* The PR has a ChangeLog file describing the changes under `<qmk_firmware>/docs/Changelog/20220226`. 46* The PR has a ChangeLog file describing the changes under `<qmk_firmware>/docs/Changelog/20220827`.
47 * This should be in Markdown format, with a name in the format `PR12345.md`, substituting the digits for your PR's ID. 47 * This should be in Markdown format, with a name in the format `PR12345.md`, substituting the digits for your PR's ID.
48 * One strong recommendation that the ChangeLog document matches the PR description on GitHub, so as to ensure traceability. 48 * One strong recommendation that the ChangeLog document matches the PR description on GitHub, so as to ensure traceability.
49 49