c9f9cb25103817aa05da494a4551ed235a750d4c

Message

2024 Q2 changelog (#23794)

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>

Diff

This diff is truncated to protect this page.

  1diff --git a/docs/ChangeLog/20240526.md b/docs/ChangeLog/20240526.md
  2new file mode 100644
  3index 0000000000000000000000000000000000000000..4cf185234cec58d2833a5135d1bf425a2d1eaa03
  4--- /dev/null
  5+++ b/docs/ChangeLog/20240526.md
  6@@ -0,0 +1,334 @@
  7+# QMK Breaking Changes - 2024 May 26 Changelog
  8+
  9+## Notable Features :id=notable-features
 10+
 11diff --git a/docs/ChangeLog/20240526/PR23309.md b/docs/ChangeLog/20240526/PR23309.md
 12deleted file mode 100644
 13index 1270e74d93487c54fa126de5c6f74176da1399f6..0000000000000000000000000000000000000000
 14--- a/docs/ChangeLog/20240526/PR23309.md
 15+++ /dev/null
 16@@ -1,35 +0,0 @@
 17-# MechKeys ACR60 Layout Updates ([#23309](https://github.com/qmk/qmk_firmware/pull/23309))
 18-
 19-This PR removed and changed some of the layouts that were configured for
 20-the ACR60. If you use one of the following layouts, you will need to
 21-update your keymap:
 22-
 23-- [`LAYOUT_hhkb`](#layout-hhkb)
 24-- [`LAYOUT_true_hhkb`](#layout-true-hhkb)
 25-- [`LAYOUT_directional`](#layout-directional)
 26-- [`LAYOUT_mitchsplit`](#layout-mitchsplit)
 27-
 28-## `LAYOUT_hhkb` :id=layout-hhkb
 29-
 30-1. Change your layout macro to `LAYOUT_60_hhkb`.
 31-2. Remove any keycodes for the key between Left Shift and QWERTY Z.
 32-
 33-## `LAYOUT_true_hhkb` :id=layout-true-hhkb
 34-
 35-1. Change your layout macro to `LAYOUT_60_true_hhkb`.
 36-2. Remove any keycodes for the key between Left Shift and QWERTY Z.
 37-
 38-## `LAYOUT_directional` :id=layout-directional
 39-
 40-1. Change your layout macro to `LAYOUT_60_ansi_arrow_split_bs`.
 41-2. Remove any keycodes for the key between Left Shift and QWERTY Z.
 42-3. Remove any keycodes for the keys immediately before *and* after the
 43-1.25u key of Split Spacebar.
 44-
 45-If you need split spacebars, you may implement
 46-`LAYOUT_60_ansi_arrow_split_space_split_bs` and change your layout to
 47-it, removing the keycode between Left Shift and QWERTY Z.
 48-
 49-## `LAYOUT_mitchsplit` :id=layout-mitchsplit
 50-
 51-1. Use `LAYOUT_60_ansi_split_space_split_rshift`.
 52diff --git a/docs/ChangeLog/20240526/PR23329.md b/docs/ChangeLog/20240526/PR23329.md
 53deleted file mode 100644
 54index 78dc609c094cf6111b521d70465250c9ff10261c..0000000000000000000000000000000000000000
 55--- a/docs/ChangeLog/20240526/PR23329.md
 56+++ /dev/null
 57@@ -1,13 +0,0 @@
 58-# P3D Spacey Layout Updates ([#23329](https://github.com/qmk/qmk_firmware/pull/23329))
 59-
 60-This PR removed the `LAYOUT` macro that was configured for the Spacey.
 61-If you have a keymap for this keyboard, you will need to update your
 62-keymap using the following steps:
 63-
 64-1. Change your layout macro to `LAYOUT_all`.
 65-2. Remove the two `KC_NO` keycodes following the Space and Delete keys
 66-   on the bottom row.
 67-3. Move the keycode for the encoder pushbutton (customarily Mute) to the
 68-   end of the top row, after the customary Backspace key.
 69-4. Move the keycode for the Right Arrow to the end of the Shift row,
 70-   after the Down Arrow key.
 71diff --git a/docs/_summary.md b/docs/_summary.md
 72index fb584955ce1d4ab399ced562fe0ed80fb208513e..adf48cec85dc66e45d48c9382f385539e321c1d1 100644
 73--- a/docs/_summary.md
 74+++ b/docs/_summary.md
 75@@ -138,7 +138,7 @@
 76   * Breaking Changes
 77     * [Overview](breaking_changes.md)
 78     * [My Pull Request Was Flagged](breaking_changes_instructions.md)
 79-    * [Most Recent ChangeLog](ChangeLog/20240225.md "QMK v0.24.0 - 2024 Feb 25")
 80+    * [Most Recent ChangeLog](ChangeLog/20240526.md "QMK v0.25.0 - 2024 May 26")
 81     * [Past Breaking Changes](breaking_changes_history.md)
 82 
 83   * C Development
 84diff --git a/docs/breaking_changes.md b/docs/breaking_changes.md
 85index b60118cd641e44f224d9526062c6ecc0e53219b3..1c0b1bafceb3e766331d1bd68681aff90351984c 100644
 86--- a/docs/breaking_changes.md
 87+++ b/docs/breaking_changes.md
 88@@ -10,25 +10,25 @@ Practically, this means QMK merges the `develop` branch into the `master` branch
 89 
 90 ## What has been included in past Breaking Changes?
 91 
 92+* [2024 May 26](ChangeLog/20240526.md)
 93 * [2024 Feb 25](ChangeLog/20240225.md)
 94 * [2023 Nov 26](ChangeLog/20231126.md)
 95-* [2023 Aug 27](ChangeLog/20230827.md)
 96 * [Older Breaking Changes](breaking_changes_history.md)
 97 
 98 ## When is the next Breaking Change?
 99 
100-The next Breaking Change is scheduled for May 26, 2024.
101+The next Breaking Change is scheduled for August 25, 2024.
102 
103 ### Important Dates
104 
105-* 2024 Feb 25 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions.
106-* 2024 Apr 28 - `develop` closed to new PRs.
107-* 2024 Apr 28 - Call for testers.
108-* 2024 May 5 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes
109-* 2024 May 19 - `develop` is locked, only critical bugfix PRs merged.
110-* 2024 May 23 - `master` is locked, no PRs merged.
111-* 2024 May 26 - Merge `develop` to `master`.
112-* 2024 May 26 - `master` is unlocked. PRs can be merged again.
113+* 2024 May 26 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions.
114+* 2024 Jul 28 - `develop` closed to new PRs.
115+* 2024 Jul 28 - Call for testers.
116+* 2024 Aug 4 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes
117+* 2024 Aug 18 - `develop` is locked, only critical bugfix PRs merged.
118+* 2024 Aug 22 - `master` is locked, no PRs merged.
119+* 2024 Aug 25 - Merge `develop` to `master`.
120+* 2024 Aug 25 - `master` is unlocked. PRs can be merged again.
121 
122 ## What changes will be included?
123 
124diff --git a/docs/breaking_changes_history.md b/docs/breaking_changes_history.md
125index 6e304685b52562a3ce184eaa555dece43c732130..6f0f25be0e6d67763fdbc6a4c61ec82ac5f0f3c6 100644
126--- a/docs/breaking_changes_history.md
127+++ b/docs/breaking_changes_history.md
128@@ -2,6 +2,7 @@
129 
130 This page links to all previous changelogs from the QMK Breaking Changes process.
131 
132+* [2024 May 26](ChangeLog/20240526.md) - version 0.25.0
133 * [2024 Feb 25](ChangeLog/20240225.md) - version 0.24.0
134 * [2023 Nov 26](ChangeLog/20231126.md) - version 0.23.0
135 * [2023 Aug 27](ChangeLog/20230827.md) - version 0.22.0
136diff --git a/util/list-moved-keyboards.sh b/util/list-moved-keyboards.sh
137new file mode 100755
138index 0000000000000000000000000000000000000000..1a39f512a256db93327ac1d71e70619cbefb7a3a
139--- /dev/null
140+++ b/util/list-moved-keyboards.sh
141@@ -0,0 +1,11 @@
142+#!/usr/bin/env bash
143+
144+echo "This might take a while... let it sit." >&2
145+
146+git cherry upstream/master upstream/develop | awk '{print $2}' | while read sha1; do
147+    git diff --name-status -M25 ${sha1}^..${sha1} | grep 'keyboards/' | grep '^R' | grep -E '(info|keyboard).json'
148+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
149+    if [[ $(echo $line | awk '{print $2}') != $(echo $line | awk '{print $3}') ]]; then
150+        echo $line
151+    fi
152+done | sort -k+2 | awk '{printf "| %s | %s |\n", $2, $3}' | column -t | sort