Skip to content

Commit

Permalink
2024 Q2 changelog (#23794)
Browse files Browse the repository at this point in the history
Co-authored-by: James Young <[email protected]>
Co-authored-by: Nick Brassel <[email protected]>
  • Loading branch information
3 people committed May 28, 2024
1 parent 249f170 commit c9f9cb2
Show file tree
Hide file tree
Showing 7 changed files with 357 additions and 59 deletions.
334 changes: 334 additions & 0 deletions docs/ChangeLog/20240526.md

Large diffs are not rendered by default.

35 changes: 0 additions & 35 deletions docs/ChangeLog/20240526/PR23309.md

This file was deleted.

13 changes: 0 additions & 13 deletions docs/ChangeLog/20240526/PR23329.md

This file was deleted.

2 changes: 1 addition & 1 deletion docs/_summary.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
* Breaking Changes
* [Overview](breaking_changes.md)
* [My Pull Request Was Flagged](breaking_changes_instructions.md)
* [Most Recent ChangeLog](ChangeLog/20240225.md "QMK v0.24.0 - 2024 Feb 25")
* [Most Recent ChangeLog](ChangeLog/20240526.md "QMK v0.25.0 - 2024 May 26")
* [Past Breaking Changes](breaking_changes_history.md)

* C Development
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 May 26](ChangeLog/20240526.md)
* [2024 Feb 25](ChangeLog/20240225.md)
* [2023 Nov 26](ChangeLog/20231126.md)
* [2023 Aug 27](ChangeLog/20230827.md)
* [Older Breaking Changes](breaking_changes_history.md)

## When is the next Breaking Change?

The next Breaking Change is scheduled for May 26, 2024.
The next Breaking Change is scheduled for August 25, 2024.

### Important Dates

* 2024 Feb 25 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions.
* 2024 Apr 28 - `develop` closed to new PRs.
* 2024 Apr 28 - Call for testers.
* 2024 May 5 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes
* 2024 May 19 - `develop` is locked, only critical bugfix PRs merged.
* 2024 May 23 - `master` is locked, no PRs merged.
* 2024 May 26 - Merge `develop` to `master`.
* 2024 May 26 - `master` is unlocked. PRs can be merged again.
* 2024 May 26 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions.
* 2024 Jul 28 - `develop` closed to new PRs.
* 2024 Jul 28 - Call for testers.
* 2024 Aug 4 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes
* 2024 Aug 18 - `develop` is locked, only critical bugfix PRs merged.
* 2024 Aug 22 - `master` is locked, no PRs merged.
* 2024 Aug 25 - Merge `develop` to `master`.
* 2024 Aug 25 - `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 May 26](ChangeLog/20240526.md) - version 0.25.0
* [2024 Feb 25](ChangeLog/20240225.md) - version 0.24.0
* [2023 Nov 26](ChangeLog/20231126.md) - version 0.23.0
* [2023 Aug 27](ChangeLog/20230827.md) - version 0.22.0
Expand Down
11 changes: 11 additions & 0 deletions util/list-moved-keyboards.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/usr/bin/env bash

echo "This might take a while... let it sit." >&2

git cherry upstream/master upstream/develop | awk '{print $2}' | while read sha1; do
git diff --name-status -M25 ${sha1}^..${sha1} | grep 'keyboards/' | grep '^R' | grep -E '(info|keyboard).json'
done | sed -e 's@keyboards/@@g' -e 's@/info.json@@g' -e 's@/keyboard.json@@g' | sort -k+2 | while IFS=$'\n' read line; do
if [[ $(echo $line | awk '{print $2}') != $(echo $line | awk '{print $3}') ]]; then
echo $line
fi
done | sort -k+2 | awk '{printf "| %s | %s |\n", $2, $3}' | column -t | sort

0 comments on commit c9f9cb2

Please sign in to comment.