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

master
QMK Bot 2023-03-29 01:52:18 +00:00
commit dc2a625a34
1 changed files with 13 additions and 7 deletions

View File

@ -4,10 +4,9 @@ permissions:
contents: read
on:
push:
branches:
- master
- develop
workflow_dispatch:
schedule:
- cron: '0 0,12 * * *'
jobs:
ci_builds:
@ -18,7 +17,9 @@ jobs:
if: github.repository == 'qmk/qmk_firmware'
strategy:
fail-fast: false
matrix:
branch: [master, develop]
keymap: [default, via]
container: ghcr.io/qmk/qmk_cli
@ -30,19 +31,24 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: recursive
ref: ${{ matrix.branch }}
- name: Install dependencies
run: pip3 install -r requirements.txt
- 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 }}
run: |
export NCPUS=$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null)
qmk mass-compile -t -j $NCPUS -km ${{ matrix.keymap }}
- name: 'Upload binaries'
- name: 'Upload artifacts'
uses: actions/upload-artifact@v3
if: always()
with:
name: binaries-${{ matrix.keymap }}
name: artifacts-${{ matrix.branch }}-${{ matrix.keymap }}
if-no-files-found: ignore
path: |
*.bin
*.hex
*.uf2
.build/failed.*