Skip to content

Commit

Permalink
Reject keyboard.json next to info.json (#24882)
Browse files Browse the repository at this point in the history
  • Loading branch information
zvecr authored Jan 29, 2025
1 parent 04c2dbd commit 76b5cef
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions lib/python/qmk/info.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,13 @@ def _validate_build_target(keyboard, info_data):
if info_file != keyboard_json_path:
_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
if keyboard_json_count == 0:
_log_warning(info_data, 'Build marker "keyboard.json" not found.')
Expand Down

0 comments on commit 76b5cef

Please sign in to comment.