diff options
| author | Nick Brassel <nick@tzarc.org> | 2023-05-29 06:17:24 +1000 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2023-05-29 06:17:24 +1000 |
| commit | 5024370dd0b441e86ace3089193e84c5b050d892 (patch) | |
| tree | b661d5b154be987f9c3dba3a526b70e0b63f9fef /docs/breaking_changes.md | |
| parent | 16767e4d59c2334fcd2d5e6556a68d5ff60ffd7b (diff) | |
| parent | 8b1d86eabf399e82af7738fb675b9c74195d0f98 (diff) | |
Merge branch 'develop'
Diffstat (limited to 'docs/breaking_changes.md')
| -rw-r--r-- | docs/breaking_changes.md | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/docs/breaking_changes.md b/docs/breaking_changes.md index 919c443123..e660182c32 100644 --- a/docs/breaking_changes.md +++ b/docs/breaking_changes.md @@ -10,27 +10,25 @@ Practically, this means QMK merges the `develop` branch into the `master` branch ## What has been included in past Breaking Changes? +* [2023 May 28](ChangeLog/20230528.md) * [2023 Feb 26](ChangeLog/20230226.md) * [2022 Nov 26](ChangeLog/20221126.md) -* [2022 Aug 27](ChangeLog/20220827.md) -* [2022 May 28](ChangeLog/20220528.md) -* [2022 Feb 26](ChangeLog/20220226.md) * [Older Breaking Changes](breaking_changes_history.md) ## When is the next Breaking Change? -The next Breaking Change is scheduled for May 28, 2023. +The next Breaking Change is scheduled for August 27, 2023. ### Important Dates -* 2023 Feb 26 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions. -* 2023 Apr 30 - `develop` closed to new PRs. -* 2023 Apr 30 - Call for testers. -* 2023 May 14 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes -* 2023 May 21 - `develop` is locked, only critical bugfix PRs merged. -* 2023 May 26 - `master` is locked, no PRs merged. -* 2023 May 28 - Merge `develop` to `master`. -* 2023 May 28 - `master` is unlocked. PRs can be merged again. +* 2023 May 28 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions. +* 2023 Jul 30 - `develop` closed to new PRs. +* 2023 Jul 30 - Call for testers. +* 2023 Aug 13 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes +* 2023 Aug 20 - `develop` is locked, only critical bugfix PRs merged. +* 2023 Aug 25 - `master` is locked, no PRs merged. +* 2023 Aug 27 - Merge `develop` to `master`. +* 2023 Aug 27 - `master` is unlocked. PRs can be merged again. ## What changes will be included? @@ -50,7 +48,7 @@ Criteria for acceptance: Strongly suggested: -* The PR has a ChangeLog file describing the changes under `<qmk_firmware>/docs/Changelog/20221126`. +* The PR has a ChangeLog file describing the changes under `<qmk_firmware>/docs/Changelog/20230827`. * This should be in Markdown format, with a name in the format `PR12345.md`, substituting the digits for your PRs ID. * One strong recommendation that the ChangeLog document matches the PR description on GitHub, so as to ensure traceability. |