From a0fa2998b8309726b6f7b61a2fc27886c632355b Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 22 Jun 2022 17:34:13 +0100 Subject: [PATCH] Use MinGW python-qmk package (#131) --- .github/workflows/build.yml | 9 +++++---- src/pip_bodge.cmd | 3 --- 2 files changed, 5 insertions(+), 7 deletions(-) delete mode 100755 src/pip_bodge.cmd diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 149c3c9..792268f 100644 --- 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 deleted file mode 100755 index bce4a52..0000000 --- a/src/pip_bodge.cmd +++ /dev/null @@ -1,3 +0,0 @@ -@echo off - -python -c "from pip._internal.cli.main import main;import sys;sys.executable='python.exe';main()" %*