Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
1ba4fef711
1 changed files with 4 additions and 3 deletions
7
.github/workflows/ci_build_major_branch.yml
vendored
7
.github/workflows/ci_build_major_branch.yml
vendored
|
@ -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 }}
|
||||||
|
|
Loading…
Reference in a new issue