From c039b5f5afe5aea332d24f2c3e4d34c0a264ef0f Mon Sep 17 00:00:00 2001 From: phewphewb Date: Sat, 31 Jan 2026 13:09:24 -0500 Subject: [PATCH 1/4] remove qmk docker image, try manual setup --- .github/actions/setup-qmk/action.yml | 31 ++++++++++++++++++++++++++++ .github/workflows/build.yml | 6 +++++- .github/workflows/release.yml | 8 ++++--- 3 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 .github/actions/setup-qmk/action.yml diff --git a/.github/actions/setup-qmk/action.yml b/.github/actions/setup-qmk/action.yml new file mode 100644 index 000000000000..0256966c3140 --- /dev/null +++ b/.github/actions/setup-qmk/action.yml @@ -0,0 +1,31 @@ +name: Setup QMK +description: Install Python, ARM/AVR toolchains, and QMK CLI + +inputs: + python-version: + description: Python version to use + default: '3.11' + include-avr: + description: Install AVR toolchain (needed for ErgoDox EZ, Planck EZ) + default: 'false' + +runs: + using: composite + steps: + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: ${{ inputs.python-version }} + + - name: Install ARM toolchain and QMK CLI + shell: bash + run: | + sudo apt-get update + sudo apt-get install -y gcc-arm-none-eabi binutils-arm-none-eabi libnewlib-arm-none-eabi + pip install qmk + + - name: Install AVR toolchain + if: inputs.include-avr == 'true' + shell: bash + run: | + sudo apt-get install -y gcc-avr avr-libc binutils-avr diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cfc7de101c39..6b0f5a4ff0fe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,6 @@ on: jobs: build-firmware: runs-on: ubuntu-latest - container: qmkfm/qmk_cli strategy: fail-fast: false matrix: @@ -29,6 +28,11 @@ jobs: persist-credentials: false submodules: true + - name: Setup QMK + uses: ./.github/actions/setup-qmk + with: + include-avr: 'true' + - name: Build id: build run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f36418414f79..d17968558d54 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,10 +29,12 @@ jobs: minor_pattern: "(feat)" version_format: "${major}.${minor}.${patch}" + - name: Setup QMK + uses: ./.github/actions/setup-qmk + - name: Build firmware - uses: docker://qmkfm/qmk_cli - with: - args: qmk compile -kb zsa/moonlander -km klayi -e SKIP_GIT=1 + run: | + qmk compile -kb zsa/moonlander -km klayi -e SKIP_GIT=1 - name: Prepare release assets run: | From 08b8e0f8b525448bfc911c266c18918013fd18a6 Mon Sep 17 00:00:00 2001 From: phewphewb Date: Sat, 31 Jan 2026 13:18:49 -0500 Subject: [PATCH 2/4] fix: update build flow to only include moonlander klayi and oryx keymaps --- .github/workflows/build.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6b0f5a4ff0fe..b006a29643f3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,10 +15,15 @@ jobs: strategy: fail-fast: false matrix: - keymap: - - default - - oryx - - klayi + include: + - keyboard: zsa/moonlander/reva + keymap: oryx + - keyboard: zsa/moonlander/revb + keymap: oryx + - keyboard: zsa/moonlander/reva + keymap: klayi + - keyboard: zsa/moonlander/revb + keymap: klayi steps: - name: Checkout QMK Firmware @@ -30,10 +35,8 @@ jobs: - name: Setup QMK uses: ./.github/actions/setup-qmk - with: - include-avr: 'true' - name: Build id: build run: | - qmk mass-compile -f manufacturer="ZSA Technology Labs" -km ${{ matrix.keymap }} -e SKIP_GIT=1 + qmk compile -kb ${{ matrix.keyboard }} -km ${{ matrix.keymap }} -e SKIP_GIT=1 From e002477435243f66730183cab750206c00143a6e Mon Sep 17 00:00:00 2001 From: phewphewb Date: Sat, 31 Jan 2026 13:28:42 -0500 Subject: [PATCH 3/4] fix typos --- keyboards/zsa/moonlander/keymaps/default/keymap.json | 2 +- keyboards/zsa/moonlander/keymaps/oryx/keymap.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/zsa/moonlander/keymaps/default/keymap.json b/keyboards/zsa/moonlander/keymaps/default/keymap.json index 2f8049c30e5d..1588584bb03a 100644 --- a/keyboards/zsa/moonlander/keymaps/default/keymap.json +++ b/keyboards/zsa/moonlander/keymaps/default/keymap.json @@ -1,5 +1,5 @@ { "modules": [ - "zsa/default" + "zsa/defaults" ] } diff --git a/keyboards/zsa/moonlander/keymaps/oryx/keymap.json b/keyboards/zsa/moonlander/keymaps/oryx/keymap.json index a078976b311c..50bd75d77d4d 100644 --- a/keyboards/zsa/moonlander/keymaps/oryx/keymap.json +++ b/keyboards/zsa/moonlander/keymaps/oryx/keymap.json @@ -1,6 +1,6 @@ { "modules": [ - "zsa/default", + "zsa/defaults", "zsa/oryx" ] } From 412e6e580398e2d48a221338953af87bf134d128 Mon Sep 17 00:00:00 2001 From: phewphewb Date: Sat, 31 Jan 2026 13:28:54 -0500 Subject: [PATCH 4/4] add missing dependency --- .github/actions/setup-qmk/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-qmk/action.yml b/.github/actions/setup-qmk/action.yml index 0256966c3140..f7f63546185c 100644 --- a/.github/actions/setup-qmk/action.yml +++ b/.github/actions/setup-qmk/action.yml @@ -21,7 +21,7 @@ runs: shell: bash run: | sudo apt-get update - sudo apt-get install -y gcc-arm-none-eabi binutils-arm-none-eabi libnewlib-arm-none-eabi + sudo apt-get install -y gcc-arm-none-eabi binutils-arm-none-eabi libnewlib-arm-none-eabi dfu-util pip install qmk - name: Install AVR toolchain