Wekuz/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

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

Browse source
This commit is contained in:
QMK Bot 2025-10-07 05:21:16 +00:00
commit e7d861aea7
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.github/workflows/ci_build_major_branch.yml vendored
View file

@ -6,13 +6,13 @@ permissions:
on: on:
push: push:
branches: [master, develop] branches: [master, develop, xap]
workflow_dispatch: workflow_dispatch:
inputs: inputs:
branch: branch:
type: choice type: choice
description: "Branch to build" description: "Branch to build"
options: [master, develop] options: [master, develop, xap]
env: env:
# https://docs.github.com/en/actions/learn-github-actions/usage-limits-billing-and-administration#usage-limits # https://docs.github.com/en/actions/learn-github-actions/usage-limits-billing-and-administration#usage-limits
@ -52,7 +52,7 @@ jobs:
run: | run: |
target_count=$( { target_count=$( {
qmk find -km default 2>/dev/null qmk find -km default 2>/dev/null
# qmk find -km xap 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 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
@ -63,8 +63,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
keymap: [default] keymap: [default, xap]
# 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 }}