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

This commit is contained in:
QMK Bot
2026-03-10 01:51:59 +00:00
2 changed files with 6 additions and 6 deletions
+1 -1
View File
@@ -85,7 +85,7 @@ jobs:
fetch-depth: 0 fetch-depth: 0
- name: Download firmwares - name: Download firmwares
uses: actions/download-artifact@v7 uses: actions/download-artifact@v8
with: with:
pattern: firmware-* pattern: firmware-*
path: . path: .
@@ -60,7 +60,7 @@ jobs:
echo "targets=$(jq -c 'keys' targets.json)" >> $GITHUB_OUTPUT echo "targets=$(jq -c 'keys' targets.json)" >> $GITHUB_OUTPUT
- name: Upload targets json - name: Upload targets json
uses: actions/upload-artifact@v6 uses: actions/upload-artifact@v7
with: with:
name: targets-${{ inputs.keymap }} name: targets-${{ inputs.keymap }}
path: targets.json path: targets.json
@@ -88,7 +88,7 @@ jobs:
run: pip3 install -r requirements-dev.txt run: pip3 install -r requirements-dev.txt
- name: Get target definitions - name: Get target definitions
uses: actions/download-artifact@v7 uses: actions/download-artifact@v8
with: with:
name: targets-${{ inputs.keymap }} name: targets-${{ inputs.keymap }}
path: . path: .
@@ -113,7 +113,7 @@ jobs:
qmk mass-compile -t -j $NCPUS -e DUMP_CI_METADATA=yes $targets || touch .failed qmk mass-compile -t -j $NCPUS -e DUMP_CI_METADATA=yes $targets || touch .failed
- name: Upload binaries - name: Upload binaries
uses: actions/upload-artifact@v6 uses: actions/upload-artifact@v7
with: with:
name: firmware-${{ inputs.keymap }}-${{ matrix.target }} name: firmware-${{ inputs.keymap }}-${{ matrix.target }}
if-no-files-found: ignore if-no-files-found: ignore
@@ -140,14 +140,14 @@ jobs:
uses: actions/checkout@v6 uses: actions/checkout@v6
- name: Download firmwares - name: Download firmwares
uses: actions/download-artifact@v7 uses: actions/download-artifact@v8
with: with:
pattern: firmware-${{ inputs.keymap }}-* pattern: firmware-${{ inputs.keymap }}-*
path: . path: .
merge-multiple: true merge-multiple: true
- name: Upload all firmwares - name: Upload all firmwares
uses: actions/upload-artifact@v6 uses: actions/upload-artifact@v7
with: with:
name: firmware-${{ inputs.keymap }} name: firmware-${{ inputs.keymap }}
if-no-files-found: ignore if-no-files-found: ignore