dba60e2e65
Re-fix building of XAP keymaps on master/develop ( #25892 )
2025-12-21 15:07:40 +11:00
7f9c8429e4
Merge remote-tracking branch 'origin/master' into develop
2025-12-20 20:34:36 +00:00
c68281b353
Handle building of XAP keymaps on master/develop ( #25848 )
2025-12-21 07:33:58 +11:00
41c2a7b070
Include userspace version (QMK_USERSPACE_VERSION) in version.h ( #25882 )
...
* Include userspace version in version.h
* Update lib/python/qmk/cli/generate/version_h.py
Co-authored-by: Joel Challis <git@zvecr.com>
* Update lib/python/qmk/cli/generate/version_h.py
Co-authored-by: Joel Challis <git@zvecr.com>
* Update lib/python/qmk/cli/generate/version_h.py
Co-authored-by: Joel Challis <git@zvecr.com>
---------
Co-authored-by: Joel Challis <git@zvecr.com>
2025-12-18 22:23:51 -05:00
bc8218371e
Merge remote-tracking branch 'origin/master' into develop
2025-12-19 02:27:38 +00:00
84d44e6188
Update bootstrap_testing.yml
2025-12-19 02:26:58 +00:00
27c2960320
Merge remote-tracking branch 'origin/master' into develop
2025-12-19 02:24:07 +00:00
54e8fad959
Ignore merge commits on bootstrap testing PRs ( #25884 )
2025-12-19 02:23:29 +00:00
42a7969d4a
Merge remote-tracking branch 'origin/master' into develop
2025-12-15 00:21:42 +00:00
2c847b0350
Consistently install branch specific dependencies in CI ( #25874 )
2025-12-15 00:21:06 +00:00
13f3f189b4
Merge remote-tracking branch 'origin/master' into develop
2025-12-12 21:17:32 +00:00
e1c869b8da
Bump actions/download-artifact from 6 to 7 ( #25873 )
...
Bumps [actions/download-artifact](https://github.com/actions/download-artifact ) from 6 to 7.
- [Release notes](https://github.com/actions/download-artifact/releases )
- [Commits](https://github.com/actions/download-artifact/compare/v6...v7 )
---
updated-dependencies:
- dependency-name: actions/download-artifact
dependency-version: '7'
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-12-12 21:16:52 +00:00
63a1d506a0
Merge remote-tracking branch 'origin/master' into develop
2025-12-12 20:11:55 +00:00
9e0118172f
Bump actions/upload-artifact from 5 to 6 ( #25872 )
...
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact ) from 5 to 6.
- [Release notes](https://github.com/actions/upload-artifact/releases )
- [Commits](https://github.com/actions/upload-artifact/compare/v5...v6 )
---
updated-dependencies:
- dependency-name: actions/upload-artifact
dependency-version: '6'
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-12-12 20:11:19 +00:00
ca8105eac0
Merge remote-tracking branch 'origin/master' into develop
2025-12-12 18:31:29 +00:00
4f9582da26
Install branch specific dependencies as part of bootstrap testing ( #25871 )
2025-12-12 18:30:46 +00:00
f39fc08338
Merge remote-tracking branch 'origin/master' into develop
2025-12-12 18:19:07 +00:00
2e68ddc826
Fix broken compilation when OS_DETECTION_DEBUG_ENABLE is defined ( #25869 )
...
Fix include in os_detection (broken in https://github.com/qmk/qmk_firmware/pull/24356 )
2025-12-12 18:17:42 +00:00
1be7cde61f
Merge remote-tracking branch 'origin/master' into develop
2025-12-10 19:12:54 +00:00
c1fedab457
Bump peter-evans/create-pull-request from 7 to 8 ( #25868 )
...
Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request ) from 7 to 8.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases )
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v7...v8 )
---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
dependency-version: '8'
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-12-10 19:12:17 +00:00
6585a244fb
Merge remote-tracking branch 'origin/master' into develop
2025-12-10 19:12:03 +00:00
2929448605
Bump JamesIves/github-pages-deploy-action from 4.7.5 to 4.7.6 ( #25867 )
...
Bumps [JamesIves/github-pages-deploy-action](https://github.com/jamesives/github-pages-deploy-action ) from 4.7.5 to 4.7.6.
- [Release notes](https://github.com/jamesives/github-pages-deploy-action/releases )
- [Commits](https://github.com/jamesives/github-pages-deploy-action/compare/v4.7.5...v4.7.6 )
---
updated-dependencies:
- dependency-name: JamesIves/github-pages-deploy-action
dependency-version: 4.7.6
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-12-10 19:11:25 +00:00
e37a611977
Merge remote-tracking branch 'origin/master' into develop
2025-12-09 19:16:43 +00:00
b39661de96
Bump JamesIves/github-pages-deploy-action from 4.7.4 to 4.7.5 ( #25865 )
...
Bumps [JamesIves/github-pages-deploy-action](https://github.com/jamesives/github-pages-deploy-action ) from 4.7.4 to 4.7.5.
- [Release notes](https://github.com/jamesives/github-pages-deploy-action/releases )
- [Commits](https://github.com/jamesives/github-pages-deploy-action/compare/v4.7.4...v4.7.5 )
---
updated-dependencies:
- dependency-name: JamesIves/github-pages-deploy-action
dependency-version: 4.7.5
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-12-09 19:16:07 +00:00
a5d7e04c66
Merge remote-tracking branch 'origin/master' into develop
2025-12-09 19:16:05 +00:00
ff75bce86a
Bump actions/github-script from 6 to 8 ( #25866 )
...
Bumps [actions/github-script](https://github.com/actions/github-script ) from 6 to 8.
- [Release notes](https://github.com/actions/github-script/releases )
- [Commits](https://github.com/actions/github-script/compare/v6...v8 )
---
updated-dependencies:
- dependency-name: actions/github-script
dependency-version: '8'
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-12-09 19:15:23 +00:00
6faca4d663
[Keyboard] Guard encoder behaviour on `projectcain/vault*` ( #25864 )
...
Initial
2025-12-09 11:55:21 +01:00
34c2e99fb3
Merge remote-tracking branch 'origin/master' into develop
2025-12-09 04:16:18 +00:00
0881e0867b
Add support for Kami65 PCB ( #24604 )
...
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2025-12-08 20:06:24 -08:00
064d8e9b62
Merge remote-tracking branch 'origin/master' into develop
2025-12-09 03:44:09 +00:00
e6e66a9f2e
Update dactyl_manuform 5x8 keyboard.json ( #24778 )
2025-12-08 19:33:02 -08:00
e2d19eda57
Add queue.len() keyboard ( #24823 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
2025-12-08 19:30:39 -08:00
10faca0b85
Move shutdown delay to audio feature ( #25859 )
2025-12-08 19:14:46 -08:00
c1b8b3dc6a
Revert test commit
2025-12-09 00:22:31 +00:00
89cf023d89
Merge remote-tracking branch 'origin/master' into develop
2025-12-09 00:22:02 +00:00
73a6496516
Trigger develop docs rebuild on push ( #25863 )
2025-12-09 00:21:25 +00:00
b68cc43094
Merge remote-tracking branch 'origin/master' into develop
2025-12-08 22:56:39 +00:00
c8f6e6a936
Revert "Trigger develop docs rebuild on push" ( #25862 )
...
Revert "Trigger develop docs rebuild on push (#25860 )"
This reverts commit a86322e4a7
2025-12-08 22:55:58 +00:00
2b61ca078d
Test commit
2025-12-08 22:44:07 +00:00
d3d025c337
Merge remote-tracking branch 'origin/master' into develop
2025-12-08 22:32:33 +00:00
a86322e4a7
Trigger develop docs rebuild on push ( #25860 )
2025-12-08 22:26:14 +00:00
505e5c7033
Add new mouse "Ploopy Nano 2 Trackball" ( #25762 )
2025-12-08 14:24:42 -08:00
d7c7421784
Fix flash wear leveling sector calculation ( #24776 )
2025-12-08 21:58:04 +00:00
b08704f078
Merge remote-tracking branch 'origin/master' into develop
2025-12-08 20:33:07 +00:00
107812ceef
[Keyboard] Add PicoFX ( #25704 )
2025-12-08 20:31:24 +00:00
1f4110d742
Merge remote-tracking branch 'origin/master' into develop
2025-12-08 20:25:58 +00:00
de8f05b4c3
[Keyboard] Add support for Alpha FS ( #25756 )
2025-12-08 20:21:12 +00:00
57b284dfa9
Refactor Makefile logic for locating keymaps ( #25808 )
2025-12-08 19:55:06 +00:00
5b94990c5a
Remove redundant URLs from `.json` ( #25856 )
2025-12-08 12:11:21 +00:00
debba50c33
Merge remote-tracking branch 'origin/master' into develop
2025-12-05 22:26:25 +00:00
Joel Challis
QMK Bot
Joshua Diamond
dependabot[bot]
Jack Sangdahl
Sắn
Philip
lental
ploopyco
Diff-fusion
Jon Colverson
Fabian Felix Selbach