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

This commit is contained in:
QMK Bot 2024-07-11 23:19:55 +00:00
commit 1ba4fef711

View file

@ -52,9 +52,9 @@ jobs:
run: | run: |
target_count=$( { target_count=$( {
qmk find -km default 2>/dev/null qmk find -km default 2>/dev/null
qmk find -km via 2>/dev/null # qmk find -km xap 2>/dev/null
} | sort | uniq | wc -l) } | sort | uniq | wc -l)
slice_length=$((target_count / ($CONCURRENT_JOBS - 1))) # Err on the side of caution as we're splitting default and via slice_length=$((target_count / ($CONCURRENT_JOBS - 1))) # Err on the side of caution
echo "slice_length=$slice_length" >> $GITHUB_OUTPUT echo "slice_length=$slice_length" >> $GITHUB_OUTPUT
build_targets: build_targets:
@ -63,7 +63,8 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
keymap: [default, via] keymap: [default]
# keymap: [default, xap]
uses: ./.github/workflows/ci_build_major_branch_keymap.yml uses: ./.github/workflows/ci_build_major_branch_keymap.yml
with: with:
branch: ${{ inputs.branch || github.ref_name }} branch: ${{ inputs.branch || github.ref_name }}