zmkfirmware
/
zmk
mirror of https://github.com/zmkfirmware/zmk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge a798c46f12 into ac7f75b859

This commit is contained in:
Rob Bowland 2026-02-03 12:30:57 -05:00 committed by GitHub
parent ac7f75b859 a798c46f12
commit 0cc495a189
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
.github/workflows/build-user-config.yml vendored
View File

@ -74,15 +74,24 @@ jobs:
export zmk_load_arg=" -DZMK_EXTRA_MODULES='${GITHUB_WORKSPACE}'" export zmk_load_arg=" -DZMK_EXTRA_MODULES='${GITHUB_WORKSPACE}'"
new_tmp_dir="${TMPDIR:-/tmp}/zmk-config" new_tmp_dir="${TMPDIR:-/tmp}/zmk-config"
mkdir -p "${new_tmp_dir}" mkdir -p "${new_tmp_dir}"
echo "base_dir=${new_tmp_dir}" >> $GITHUB_ENV base_dir="${new_tmp_dir}"
else else
echo "base_dir=${GITHUB_WORKSPACE}" >> $GITHUB_ENV base_dir=${GITHUB_WORKSPACE}
fi fi
if [ -n "${snippet}" ]; then if [ -n "${snippet}" ]; then
extra_west_args="-S \"${snippet}\"" extra_west_args="-S \"${snippet}\""
fi fi
config_path_parent="$(dirname ${{ inputs.config_path }})"
if [ "${config_path_parent}" = "${base_dir}" ]; then
west_workspace_dir="${base_dir}"
else
west_workspace_dir="${base_dir}/${config_path_parent}"
fi
echo "base_dir=${base_dir}" >> $GITHUB_ENV
echo "west_workspace_dir=${west_workspace_dir}" >> $GITHUB_ENV
echo "zephyr_version=${ZEPHYR_VERSION}" >> $GITHUB_ENV echo "zephyr_version=${ZEPHYR_VERSION}" >> $GITHUB_ENV
echo "extra_west_args=${extra_west_args}" >> $GITHUB_ENV echo "extra_west_args=${extra_west_args}" >> $GITHUB_ENV
echo "extra_cmake_args=${shield:+-DSHIELD=\"$shield\"}${zmk_load_arg}" >> $GITHUB_ENV echo "extra_cmake_args=${shield:+-DSHIELD=\"$shield\"}${zmk_load_arg}" >> $GITHUB_ENV
@ -103,11 +112,11 @@ jobs:
cache_name: cache-zephyr-${{ env.zephyr_version }}-modules cache_name: cache-zephyr-${{ env.zephyr_version }}-modules
with: with:
path: | path: |
${{ env.base_dir }}/modules/ ${{ env.west_workspace_dir }}/modules/
${{ env.base_dir }}/tools/ ${{ env.west_workspace_dir }}/tools/
${{ env.base_dir }}/zephyr/ ${{ env.west_workspace_dir }}/zephyr/
${{ env.base_dir }}/bootloader/ ${{ env.west_workspace_dir }}/bootloader/
${{ env.base_dir }}/zmk/ ${{ env.west_workspace_dir }}/zmk/
key: ${{ runner.os }}-build-${{ env.cache_name }}-${{ hashFiles('**/west.yml', '**/build.yaml') }} key: ${{ runner.os }}-build-${{ env.cache_name }}-${{ hashFiles('**/west.yml', '**/build.yaml') }}
restore-keys: | restore-keys: |
${{ runner.os }}-build-${{ env.cache_name }}- ${{ runner.os }}-build-${{ env.cache_name }}-
@ -119,7 +128,7 @@ jobs:
run: west init -l "${{ env.base_dir }}/${{ inputs.config_path }}" run: west init -l "${{ env.base_dir }}/${{ inputs.config_path }}"
- name: West Update - name: West Update
working-directory: ${{ env.base_dir }} working-directory: ${{ env.west_workspace_dir }}
run: west update --fetch-opt=--filter=tree:0 run: west update --fetch-opt=--filter=tree:0
- name: Check ZMK revision - name: Check ZMK revision
@ -130,11 +139,11 @@ jobs:
echo "ZMK revision: ${zmk_revision}" echo "ZMK revision: ${zmk_revision}"
- name: West Zephyr export - name: West Zephyr export
working-directory: ${{ env.base_dir }} working-directory: ${{ env.west_workspace_dir }}
run: west zephyr-export run: west zephyr-export
- name: West Build (${{ env.display_name }}) - name: West Build (${{ env.display_name }})
working-directory: ${{ env.base_dir }} working-directory: ${{ env.west_workspace_dir }}
shell: sh -x {0} shell: sh -x {0}
run: west build -s zmk/app -d "${{ env.build_dir }}" -b "${{ matrix.board }}" ${{ env.extra_west_args }} -- -DZMK_CONFIG=${{ env.base_dir }}/${{ inputs.config_path }} ${{ env.extra_cmake_args }} ${{ matrix.cmake-args }} run: west build -s zmk/app -d "${{ env.build_dir }}" -b "${{ matrix.board }}" ${{ env.extra_west_args }} -- -DZMK_CONFIG=${{ env.base_dir }}/${{ inputs.config_path }} ${{ env.extra_cmake_args }} ${{ matrix.cmake-args }}