From 45c8ad670996e7d07d26fd09086d9e2d416897c5 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Mon, 29 Jun 2026 06:28:53 +0100
Subject: [PATCH] Run test script on Windows (#241)

---
 .github/workflows/cli_setup.yml | 19 ++++---------------
 ci_tests                        |  7 ++++++-
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/cli_setup.yml b/.github/workflows/cli_setup.yml
index f192a21..9c7f3ab 100644
--- a/.github/workflows/cli_setup.yml
+++ b/.github/workflows/cli_setup.yml
@@ -11,9 +11,6 @@ jobs:
     runs-on: ubuntu-latest
     container: ghcr.io/qmk/qmk_base_container
 
-    env:
-      QMK_HOME: ~/qmk_firmware
-
     steps:
     - uses: actions/checkout@v7
 
@@ -27,8 +24,7 @@ jobs:
     needs: test_cli_base_container
 
     runs-on: ${{ matrix.os }}
-    env:
-      QMK_HOME: ~/qmk_firmware
+
     strategy:
       matrix:
         os: [macos-latest, ubuntu-latest]
@@ -49,8 +45,6 @@ jobs:
     needs: test_cli_base_container
 
     runs-on: windows-latest
-    env:
-      QMK_HOME: $HOME/qmk_firmware
 
     steps:
     - uses: actions/checkout@v7
@@ -59,7 +53,7 @@ jobs:
       uses: msys2/setup-msys2@v2
       with:
         update: true
-        install: git mingw-w64-x86_64-toolchain mingw-w64-x86_64-python-pip mingw-w64-x86_64-python-build mingw-w64-x86_64-python-pillow mingw-w64-x86_64-rust
+        install: git mingw-w64-x86_64-toolchain mingw-w64-x86_64-python-pip mingw-w64-x86_64-python-build mingw-w64-x86_64-python-pillow mingw-w64-x86_64-rust mingw-w64-x86_64-python-halo mingw-w64-x86_64-python-nh3 mingw-w64-x86_64-python-rpds-py
 
     # Upgrade pip due to msys packaging + pypa/build/pull/736 issues
     - name: (MSYS2) Install Python dependencies
@@ -67,11 +61,6 @@ jobs:
       run: |
         python3 -m pip install --break-system-packages --force-reinstall --upgrade pip
 
-    - name: (MSYS2) Install QMK CLI from source
+    - name: Run ci_tests
       shell: msys2 {0}
-      run: |
-        python3 -m build
-        python3 -m pip install --break-system-packages dist/qmk-*.tar.gz
-    - name: (MSYS2) Run qmk setup -y
-      shell: msys2 {0}
-      run: qmk setup -y
+      run: ./ci_tests -a
diff --git a/ci_tests b/ci_tests
index 60963fb..dfa00c6 100755
--- a/ci_tests
+++ b/ci_tests
@@ -25,7 +25,12 @@ if [ -e .ci_venv ]; then
     rm -rf .ci_venv
 fi
 
-python3 -m venv .ci_venv
+# Avoid issues with building pillow as we install mingw-w64-x86_64-python-pillow
+if [[ "$(uname -s)" =~ ^MINGW64_NT.* ]]; then
+    CI_VENV_ARGS="--system-site-packages"
+fi
+
+python3 -m venv $CI_VENV_ARGS .ci_venv
 source .ci_venv/bin/activate
 
 # Install dependencies