diff options
| author | Joel Challis <git@zvecr.com> | 2025-05-26 12:04:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-26 21:04:52 +1000 |
| commit | 3703699757b6ce938ff412aca0a8b064927c0cdb (patch) | |
| tree | 2b264de0e7a724c30cca511a9bac7ad29705d1a2 /docs/breaking_changes.md | |
| parent | c97a798af76f6717d56d7279d418f49a96730e4f (diff) | |
2025 Q2 changelog (#25297)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
Diffstat (limited to 'docs/breaking_changes.md')
| -rw-r--r-- | docs/breaking_changes.md | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/docs/breaking_changes.md b/docs/breaking_changes.md index a5a57ccd12..9063fc18db 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 | * [2025 May 25](ChangeLog/20250525) | ||
| 13 | * [2025 Feb 23](ChangeLog/20250223) | 14 | * [2025 Feb 23](ChangeLog/20250223) |
| 14 | * [2024 Nov 24](ChangeLog/20241124) | 15 | * [2024 Nov 24](ChangeLog/20241124) |
| 15 | * [2024 Aug 25](ChangeLog/20240825) | ||
| 16 | * [Older Breaking Changes](breaking_changes_history) | 16 | * [Older Breaking Changes](breaking_changes_history) |
| 17 | 17 | ||
| 18 | ## When is the next Breaking Change? | 18 | ## When is the next Breaking Change? |
| 19 | 19 | ||
| 20 | The next Breaking Change is scheduled for May 25, 2025. | 20 | The next Breaking Change is scheduled for Aug 31, 2025. |
| 21 | 21 | ||
| 22 | ### Important Dates | 22 | ### Important Dates |
| 23 | 23 | ||
| 24 | * 2025 Feb 23 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions. | 24 | * 2025 May 25 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions. |
| 25 | * 2025 Apr 27 - `develop` closed to new PRs. | 25 | * 2025 Aug 3 - `develop` closed to new PRs. |
| 26 | * 2025 Apr 27 - Call for testers. | 26 | * 2025 Aug 3 - Call for testers. |
| 27 | * 2025 May 11 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes | 27 | * 2025 Aug 17 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes |
| 28 | * 2025 May 18 - `develop` is locked, only critical bugfix PRs merged. | 28 | * 2025 Aug 24 - `develop` is locked, only critical bugfix PRs merged. |
| 29 | * 2025 May 23 - `master` is locked, no PRs merged. | 29 | * 2025 Aug 29 - `master` is locked, no PRs merged. |
| 30 | * 2025 May 25 - Merge `develop` to `master`. | 30 | * 2025 Aug 31 - Merge `develop` to `master`. |
| 31 | * 2025 May 25 - `master` is unlocked. PRs can be merged again. | 31 | * 2025 Aug 31 - `master` is unlocked. PRs can be merged again. |
| 32 | 32 | ||
| 33 | ## What changes will be included? | 33 | ## What changes will be included? |
| 34 | 34 | ||