summaryrefslogtreecommitdiff
path: root/docs/breaking_changes.md
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2023-08-29 21:15:21 +1000
committerGitHub <noreply@github.com>2023-08-29 21:15:21 +1000
commit4818e14c7771e849ea472944f65499f87845ea3f (patch)
tree6ce12eba7de5d379625b30290f1ebdadbdba9552 /docs/breaking_changes.md
parent66b744b63b6328a206f9ab463b4acb44002e4bb0 (diff)
Breaking changes changelog, 2023q3 version (#21848)
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: honorless <86894501+lesshonor@users.noreply.github.com>
Diffstat (limited to 'docs/breaking_changes.md')
-rw-r--r--docs/breaking_changes.md22
1 files changed, 11 insertions, 11 deletions
diff --git a/docs/breaking_changes.md b/docs/breaking_changes.md
index f4560b746f..fdf6ccef9c 100644
--- a/docs/breaking_changes.md
+++ b/docs/breaking_changes.md
@@ -10,25 +10,25 @@ Practically, this means QMK merges the `develop` branch into the `master` branch
10 10
11## What has been included in past Breaking Changes? 11## What has been included in past Breaking Changes?
12 12
13* [2023 Aug 27](ChangeLog/20230827.md)
13* [2023 May 28](ChangeLog/20230528.md) 14* [2023 May 28](ChangeLog/20230528.md)
14* [2023 Feb 26](ChangeLog/20230226.md) 15* [2023 Feb 26](ChangeLog/20230226.md)
15* [2022 Nov 26](ChangeLog/20221126.md)
16* [Older Breaking Changes](breaking_changes_history.md) 16* [Older Breaking Changes](breaking_changes_history.md)
17 17
18## When is the next Breaking Change? 18## When is the next Breaking Change?
19 19
20The next Breaking Change is scheduled for August 27, 2023. 20The next Breaking Change is scheduled for November 26, 2023.
21 21
22### Important Dates 22### Important Dates
23 23
24* 2023 May 28 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions. 24* 2023 Aug 27 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions.
25* 2023 Jul 30 - `develop` closed to new PRs. 25* 2023 Oct 29 - `develop` closed to new PRs.
26* 2023 Jul 30 - Call for testers. 26* 2023 Oct 29 - Call for testers.
27* 2023 Aug 13 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes 27* 2023 Nov 5 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes
28* 2023 Aug 20 - `develop` is locked, only critical bugfix PRs merged. 28* 2023 Nov 19 - `develop` is locked, only critical bugfix PRs merged.
29* 2023 Aug 25 - `master` is locked, no PRs merged. 29* 2023 Nov 23 - `master` is locked, no PRs merged.
30* 2023 Aug 27 - Merge `develop` to `master`. 30* 2023 Nov 26 - Merge `develop` to `master`.
31* 2023 Aug 27 - `master` is unlocked. PRs can be merged again. 31* 2023 Nov 26 - `master` is unlocked. PRs can be merged again.
32 32
33## What changes will be included? 33## What changes will be included?
34 34
@@ -48,7 +48,7 @@ Criteria for acceptance:
48 48
49Strongly suggested: 49Strongly suggested:
50 50
51* The PR has a ChangeLog file describing the changes under `<qmk_firmware>/docs/Changelog/20230827`. 51* The PR has a ChangeLog file describing the changes under `<qmk_firmware>/docs/Changelog/20231126`.
52 * This should be in Markdown format, with a name in the format `PR12345.md`, substituting the digits for your PRs ID. 52 * This should be in Markdown format, with a name in the format `PR12345.md`, substituting the digits for your PRs ID.
53 * One strong recommendation that the ChangeLog document matches the PR description on GitHub, so as to ensure traceability. 53 * One strong recommendation that the ChangeLog document matches the PR description on GitHub, so as to ensure traceability.
54 54