Use MinGW python-qmk package (#131)

qmk · Jun 22, 2022 · a0fa299 · a0fa299
1 parent 087f6c0
commit a0fa299
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -56,16 +56,17 @@ jobs:
         .build\msys64\msys2_shell.cmd -mingw64 -defterm -no-start -c "pacman -Syu --noconfirm || true"
         .build\msys64\msys2_shell.cmd -mingw64 -defterm -no-start -c "pacman -Syu --noconfirm"
         .build\msys64\msys2_shell.cmd -mingw64 -defterm -no-start -c "pacman -Su --noconfirm"
-        cp src/pip_bodge.cmd .build/msys64/usr/bin/
 
     - name: Install QMK cli
       run: |
         .build\msys64\msys2_shell.cmd -mingw64 -defterm -no-start -c "pacman --needed --noconfirm --disable-download-timeout -S pactoys"
-        .build\msys64\msys2_shell.cmd -mingw64 -defterm -no-start -c "pacboy sync --needed --noconfirm --disable-download-timeout base-devel: toolchain:x clang:x git: unzip: python3-pip:x python3-setuptools:x python-pillow:x avr-binutils:x avr-gcc:x avr-libc:x arm-none-eabi-binutils:x arm-none-eabi-gcc:x arm-none-eabi-newlib:x avrdude:x bootloadhid:x dfu-programmer:x dfu-util:x mdloader:x teensy-loader-cli:x hidapi:x"
-        .build\msys64\msys2_shell.cmd -mingw64 -defterm -no-start -c "python3 -m pip install pygments qmk-dotty-dict hjson jsonschema"
-        .build\msys64\msys2_shell.cmd -mingw64 -defterm -no-start -c "pip_bodge.cmd install qmk==${{ steps.dotenv.outputs.qmk_cli_ver }}"
+        .build\msys64\msys2_shell.cmd -mingw64 -defterm -no-start -c "pacboy sync --needed --noconfirm --disable-download-timeout base-devel: toolchain:x clang:x git: python-qmk:x hidapi:x avr-binutils:x avr-gcc:x avr-libc:x arm-none-eabi-binutils:x arm-none-eabi-gcc:x arm-none-eabi-newlib:x avrdude:x bootloadhid:x dfu-programmer:x dfu-util:x hid-bootloader-cli:x mdloader:x teensy-loader-cli:x wb32-dfu-updater:x"
         .build\msys64\msys2_shell.cmd -mingw64 -defterm -no-start -c "qmk"
 
+    - name: Test QMK cli version
+      run: |
+        .build\msys64\msys2_shell.cmd -mingw64 -defterm -no-start -c "qmk --version | grep -F ${{ steps.dotenv.outputs.qmk_cli_ver }}"
+
     - name: Patch Up MSYS
       shell: 'bash {0}'
       run: |

diff --git a/src/pip_bodge.cmd b/src/pip_bodge.cmd