drashna/qmk_firmware
1
0
Fork 0
Code Activity

Reject keyboard.json next to info.json (#24882)

Browse source
This commit is contained in:
Joel Challis 2025-01-29 19:17:29 +00:00 • committed by GitHub
parent 04c2dbd3df
commit 76b5cef793
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/python/qmk/info.py
View file

@ -99,6 +99,13 @@ def _validate_build_target(keyboard, info_data):
if info_file != keyboard_json_path: if info_file != keyboard_json_path:
_log_error(info_data, f'Invalid keyboard.json location detected: {info_file}.') _log_error(info_data, f'Invalid keyboard.json location detected: {info_file}.')
# No keyboard.json next to info.json
for conf_file in config_files:
if conf_file.name == 'keyboard.json':
info_file = conf_file.parent / 'info.json'
if info_file.exists():
_log_error(info_data, f'Invalid info.json location detected: {info_file}.')
# Moving forward keyboard.json should be used as a build target # Moving forward keyboard.json should be used as a build target
if keyboard_json_count == 0: if keyboard_json_count == 0:
_log_warning(info_data, 'Build marker "keyboard.json" not found.') _log_warning(info_data, 'Build marker "keyboard.json" not found.')