Skip to content

Commit 498d755

Browse files
authored
Update to qmk_cli 1.2.0 (#238)
1 parent 79426d6 commit 498d755

File tree

4 files changed

+17
-4
lines changed

4 files changed

+17
-4
lines changed

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
MSYS_URL="https://github.com/msys2/msys2-installer/releases/download/2025-08-30/msys2-base-x86_64-20250830.tar.xz"
22
CONEMU_URL="https://github.com/ConEmu/ConEmu/releases/download/v23.07.24/ConEmuPack.230724.7z"
3-
QMK_CLI_VER="1.1.8"
3+
QMK_CLI_VER="1.2.0"

.github/workflows/build.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,15 @@ jobs:
5252
.build\msys64\msys2_shell.cmd -mingw64 -defterm -no-start -c "pacman -Syu --noconfirm"
5353
.build\msys64\msys2_shell.cmd -mingw64 -defterm -no-start -c "pacman -Su --noconfirm"
5454
55-
- name: Install QMK cli
55+
- name: Install CLI
5656
run: |
5757
.build\msys64\msys2_shell.cmd -mingw64 -defterm -no-start -c "pacman --needed --noconfirm --disable-download-timeout -S pactoys"
58-
.build\msys64\msys2_shell.cmd -mingw64 -defterm -no-start -c "pacboy sync --needed --noconfirm --disable-download-timeout base-devel: toolchain:x clang:x git: jq:x python-appdirs:x 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"
59-
.build\msys64\msys2_shell.cmd -mingw64 -defterm -no-start -c "qmk"
58+
.build\msys64\msys2_shell.cmd -mingw64 -defterm -no-start -c "pacboy sync --needed --noconfirm --disable-download-timeout base-devel: toolchain:x clang:x tree: git: jq:x ripgrep:x python-appdirs:x python-qmk:x hidapi:x"
59+
60+
- name: Install QMK Additional Tools
61+
run: |
62+
.build\msys64\msys2_shell.cmd -mingw64 -defterm -no-start -c "mkdir -p /opt/uv/bin"
63+
.build\msys64\msys2_shell.cmd -mingw64 -defterm -no-start -c "export UV_NO_MODIFY_PATH=1 && export UV_PYTHON_INSTALL_DIR=/opt/uv/bin && curl -fsSL https://install.qmk.fm | sh -s -- --confirm --skip-qmk-cli --skip-windows-drivers"
6064
6165
- name: Test QMK cli version
6266
run: |

docs/faq.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ pacman -Syu
3131

3232
# If needed, close QMK MSYS, run it again from Start menu. Update the rest with:
3333
pacman -Su
34+
35+
# Rerun bootstrap
36+
export UV_NO_MODIFY_PATH=1
37+
export UV_PYTHON_INSTALL_DIR=/opt/uv/bin
38+
curl -fsSL https://install.qmk.fm | sh -s -- --confirm --skip-qmk-cli --skip-windows-drivers
3439
```
3540

3641
</details>

src/etc/post-install/99-qmk.post

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ maybe_qmk_welcome () {
2727
fi
2828
}
2929

30+
# Handle bootstrap install location
31+
export PATH=/opt/qmk/bin:/opt/uv/tools/bin:$PATH
32+
export QMK_DISTRIB_DIR=/opt/qmk
33+
3034
maybe_qmk_welcome
3135

3236
# Force prompt to not state terminal type

0 commit comments

Comments
 (0)