aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <[email protected]>2024-06-04 02:24:35 +0000
committerQMK Bot <[email protected]>2024-06-04 02:24:35 +0000
commit1a343cfaf45b690fe1b9c0815ce1ddc0e50353c8 (patch)
treeceba35d7368a5712c7a875f6a4bad17a28cdcd90
parentc1c7c4f6e0d116e548fc0265a79dc1934c7050d0 (diff)
parent6d365dd8f11cfb440a1c7e67572d3deb10f7833f (diff)
downloadqmk_firmware-1a343cfaf45b690fe1b9c0815ce1ddc0e50353c8.tar.gz
qmk_firmware-1a343cfaf45b690fe1b9c0815ce1ddc0e50353c8.zip
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--Makefile15
1 files changed, 15 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 78d1a372bc..5fcd6bbf0f 100644
--- a/Makefile
+++ b/Makefile
@@ -465,3 +465,18 @@ distclean_userspace: clean
rm -f $(QMK_USERSPACE)/*.bin $(QMK_USERSPACE)/*.hex $(QMK_USERSPACE)/*.uf2
echo 'done.'
endif
+
+# Extra targets for formatting and/or pytest, running within the qmk/qmk_cli container to match GHA.
+CONTAINER_PREAMBLE := export HOME="/tmp"; export PATH="/tmp/.local/bin:\$$PATH"; python3 -m pip install --upgrade pip; python3 -m pip install -r requirements-dev.txt
+
+.PHONY: format-core
+format-core:
+ RUNTIME=docker ./util/docker_cmd.sh bash -lic "$(CONTAINER_PREAMBLE); qmk format-c --core-only -a && qmk format-python -a"
+
+.PHONY: pytest
+pytest:
+ RUNTIME=docker ./util/docker_cmd.sh bash -lic "$(CONTAINER_PREAMBLE); qmk pytest"
+
+.PHONY: format-and-pytest
+format-and-pytest:
+ RUNTIME=docker ./util/docker_cmd.sh bash -lic "$(CONTAINER_PREAMBLE); qmk format-c --core-only -a && qmk format-python -a && qmk pytest"