Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2024-03-31 11:24:09 +00:00
commit a939ee1197

View File

@ -41,17 +41,17 @@ def compile(cli):
cli.args.filter = [] cli.args.filter = []
cli.config.mass_compile.keymap = cli.config.compile.keymap cli.config.mass_compile.keymap = cli.config.compile.keymap
cli.config.mass_compile.parallel = cli.config.compile.parallel cli.config.mass_compile.parallel = cli.config.compile.parallel
cli.config.mass_compile.no_temp = False cli.args.no_temp = False
return mass_compile(cli) return mass_compile(cli)
# If we've received `-km all`, reroute it to mass-compile. # If we've received `-km all`, reroute it to mass-compile.
if cli.args.keymap == 'all': if cli.args.keymap == 'all':
from .mass_compile import mass_compile from .mass_compile import mass_compile
cli.args.builds = [f'{cli.args.keyboard}:all'] cli.args.builds = [f'{cli.config.compile.keyboard}:all']
cli.args.filter = [] cli.args.filter = []
cli.config.mass_compile.keymap = None cli.config.mass_compile.keymap = None
cli.config.mass_compile.parallel = cli.config.compile.parallel cli.config.mass_compile.parallel = cli.config.compile.parallel
cli.config.mass_compile.no_temp = False cli.args.no_temp = False
return mass_compile(cli) return mass_compile(cli)
# Build the environment vars # Build the environment vars