qmk/qmk_firmware
1
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2026-10-23 17:32:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
QMK Bot
2025-11-06 23:44:15 +00:00
parent e4463611e7 4b393a1ff5
commit c8db411b79
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci_build_major_branch.yml
+1 -1
View File
@@ -87,7 +87,7 @@ jobs:
fetch-depth: 0 fetch-depth: 0
- name: Download firmwares - name: Download firmwares
uses: actions/download-artifact@v5 uses: actions/download-artifact@v6
with: with:
pattern: firmware-* pattern: firmware-*
path: . path: .
.github/workflows/ci_build_major_branch_keymap.yml
+5 -5
View File
@@ -62,7 +62,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@v4 uses: actions/upload-artifact@v5
with: with:
name: targets-${{ inputs.keymap }} name: targets-${{ inputs.keymap }}
path: targets.json path: targets.json
@@ -92,7 +92,7 @@ jobs:
uses: actions/checkout@v5 uses: actions/checkout@v5
- name: Get target definitions - name: Get target definitions
uses: actions/download-artifact@v5 uses: actions/download-artifact@v6
with: with:
name: targets-${{ inputs.keymap }} name: targets-${{ inputs.keymap }}
path: . path: .
@@ -112,7 +112,7 @@ jobs:
qmk mass-compile -t -j $NCPUS -e DUMP_CI_METADATA=yes $(jq -r '.["${{ matrix.target }}"].targets' targets.json) || touch .failed qmk mass-compile -t -j $NCPUS -e DUMP_CI_METADATA=yes $(jq -r '.["${{ matrix.target }}"].targets' targets.json) || touch .failed
- name: Upload binaries - name: Upload binaries
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v5
with: with:
name: firmware-${{ inputs.keymap }}-${{ matrix.target }} name: firmware-${{ inputs.keymap }}-${{ matrix.target }}
if-no-files-found: ignore if-no-files-found: ignore
@@ -139,14 +139,14 @@ jobs:
uses: actions/checkout@v5 uses: actions/checkout@v5
- name: Download firmwares - name: Download firmwares
uses: actions/download-artifact@v5 uses: actions/download-artifact@v6
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@v4 uses: actions/upload-artifact@v5
with: with:
name: firmware-${{ inputs.keymap }} name: firmware-${{ inputs.keymap }}
if-no-files-found: ignore if-no-files-found: ignore