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

master
QMK Bot 2021-03-18 17:25:01 +00:00
commit 90b1e271a8
1 changed files with 11 additions and 5 deletions

View File

@ -31,7 +31,13 @@ def os_tests():
def os_test_linux():
"""Run the Linux specific tests.
"""
cli.log.info("Detected {fg_cyan}Linux.")
# Don't bother with udev on WSL, for now
if 'microsoft' in platform.uname().release.lower():
cli.log.info("Detected {fg_cyan}Linux (WSL){fg_reset}.")
return CheckStatus.OK
else:
cli.log.info("Detected {fg_cyan}Linux{fg_reset}.")
from qmk.os_helpers.linux import check_udev_rules
return check_udev_rules()
@ -40,7 +46,7 @@ def os_test_linux():
def os_test_macos():
"""Run the Mac specific tests.
"""
cli.log.info("Detected {fg_cyan}macOS.")
cli.log.info("Detected {fg_cyan}macOS{fg_reset}.")
return CheckStatus.OK
@ -48,7 +54,7 @@ def os_test_macos():
def os_test_windows():
"""Run the Windows specific tests.
"""
cli.log.info("Detected {fg_cyan}Windows.")
cli.log.info("Detected {fg_cyan}Windows{fg_reset}.")
return CheckStatus.OK