Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2023-03-18 15:59:55 +00:00
commit 01c61139b9

View file

@ -20,7 +20,6 @@ jobs:
strategy: strategy:
matrix: matrix:
keymap: [default, via] keymap: [default, via]
keyboard_folder: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z]
container: ghcr.io/qmk/qmk_cli container: ghcr.io/qmk/qmk_cli
@ -35,13 +34,13 @@ jobs:
- name: Install dependencies - name: Install dependencies
run: pip3 install -r requirements.txt run: pip3 install -r requirements.txt
- name: Run `qmk mass-compile` (keyboards ${{ matrix.keyboard_folder }}*, keymap ${{ matrix.keymap }}) - name: Run `qmk mass-compile` (keymap ${{ matrix.keymap }})
run: qmk mass-compile -j $(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null) -km ${{ matrix.keymap }} -f 'keyboard_folder=${{ matrix.keyboard_folder }}*' run: qmk mass-compile -j $(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null) -km ${{ matrix.keymap }}
- name: 'Upload binaries' - name: 'Upload binaries'
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: binaries-${{ matrix.keyboard_folder }}-${{ matrix.keymap }} name: binaries-${{ matrix.keymap }}
if-no-files-found: ignore if-no-files-found: ignore
path: | path: |
*.bin *.bin