Skip to content

Commit

Permalink
dates
Browse files Browse the repository at this point in the history
  • Loading branch information
tzarc committed Nov 26, 2024
1 parent 831f411 commit 46e9093
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 11 deletions.
2 changes: 1 addition & 1 deletion docs/_sidebar.json
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@
{ "text": "My Pull Request Was Flagged", "link": "/breaking_changes_instructions" },
{
"text": "Most Recent ChangeLog",
"link": "/ChangeLog/20240825"
"link": "/ChangeLog/20241124"
},
{ "text": "Past Breaking Changes", "link": "/breaking_changes_history" },
{ "text": "Deprecation Policy", "link": "/support_deprecation_policy" }
Expand Down
20 changes: 10 additions & 10 deletions docs/breaking_changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,25 @@ Practically, this means QMK merges the `develop` branch into the `master` branch

## What has been included in past Breaking Changes?

* [2024 Nov 24](ChangeLog/20241124)
* [2024 Aug 25](ChangeLog/20240825)
* [2024 May 26](ChangeLog/20240526)
* [2024 Feb 25](ChangeLog/20240225)
* [Older Breaking Changes](breaking_changes_history)

## When is the next Breaking Change?

The next Breaking Change is scheduled for November 24, 2024.
The next Breaking Change is scheduled for February 23, 2025.

### Important Dates

* 2024 Aug 25 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions.
* 2024 Oct 27 - `develop` closed to new PRs.
* 2024 Oct 27 - Call for testers.
* 2024 Nov 10 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes
* 2024 Nov 17 - `develop` is locked, only critical bugfix PRs merged.
* 2024 Nov 22 - `master` is locked, no PRs merged.
* 2024 Nov 24 - Merge `develop` to `master`.
* 2024 Nov 24 - `master` is unlocked. PRs can be merged again.
* 2024 Nov 24 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions.
* 2025 Jan 26 - `develop` closed to new PRs.
* 2025 Jan 26 - Call for testers.
* 2025 Feb 9 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes
* 2025 Feb 16 - `develop` is locked, only critical bugfix PRs merged.
* 2024 Nov 21 - `master` is locked, no PRs merged.
* 2025 Feb 23 - Merge `develop` to `master`.
* 2025 Feb 23 - `master` is unlocked. PRs can be merged again.

## What changes will be included?

Expand Down
1 change: 1 addition & 0 deletions docs/breaking_changes_history.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

This page links to all previous changelogs from the QMK Breaking Changes process.

* [2024 Nov 24](ChangeLog/20241124) - version 0.27.0
* [2024 Aug 25](ChangeLog/20240825) - version 0.26.0
* [2024 May 26](ChangeLog/20240526) - version 0.25.0
* [2024 Feb 25](ChangeLog/20240225) - version 0.24.0
Expand Down

0 comments on commit 46e9093

Please sign in to comment.