forked from zmkfirmware/zmk
-
Notifications
You must be signed in to change notification settings - Fork 51
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(build): Build unified config/mod repos.
* Detect in our build script if our config repo is *also* a Zephyr module and if so pass to ZMK build in ZMK_EXTRA_MODULES define. * Copy config directory contents to new independent temp workspace to avoid Kconfig conflicts between the build repo's zephyr module directory and the checkout zephyr pulled in by `west update`.
- Loading branch information
1 parent
d46b350
commit 58adefc
Showing
1 changed file
with
42 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -52,20 +52,36 @@ jobs: | |
fail-fast: false | ||
matrix: ${{ fromJson(needs.matrix.outputs.build_matrix) }} | ||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v3 | ||
|
||
- name: Create build directory | ||
run: | | ||
echo "build_dir=$(mktemp -d)" >> $GITHUB_ENV | ||
- name: Prepare variables | ||
shell: sh -x {0} | ||
env: | ||
board: ${{ matrix.board }} | ||
shield: ${{ matrix.shield }} | ||
artifact_name: ${{ matrix.artifact-name }} | ||
run: | | ||
export new_tmp_dir=$(mktemp -d) | ||
echo "tmp_dir=${new_tmp_dir}" >> $GITHUB_ENV | ||
echo "tmp_config_dir=${new_tmp_dir}/config" >> $GITHUB_ENV | ||
if [ -e zephyr/module.yml ]; then | ||
export zmk_load_arg=" -DZMK_EXTRA_MODULES='${GITHUB_WORKSPACE}'" | ||
fi | ||
echo "zephyr_version=${ZEPHYR_VERSION}" >> $GITHUB_ENV | ||
echo "extra_cmake_args=${shield:+-DSHIELD=\"$shield\"}" >> $GITHUB_ENV | ||
echo "extra_cmake_args=${shield:+-DSHIELD=\"$shield\"}${zmk_load_arg}" >> $GITHUB_ENV | ||
echo "display_name=${shield:+$shield - }${board}" >> $GITHUB_ENV | ||
echo "artifact_name=${artifact_name:-${shield:+$shield-}${board}-zmk}" >> $GITHUB_ENV | ||
- name: Checkout | ||
uses: actions/checkout@v3 | ||
- name: Copy config files to isolated temporary directory | ||
run: | | ||
mkdir "${{ env.tmp_config_dir }}" | ||
cp -R ${{ inputs.config_path }}/* "${{ env.tmp_config_dir }}/" | ||
- name: Cache west modules | ||
uses: actions/[email protected] | ||
|
@@ -74,48 +90,52 @@ jobs: | |
cache_name: cache-zephyr-${{ env.zephyr_version }}-modules | ||
with: | ||
path: | | ||
modules/ | ||
tools/ | ||
zephyr/ | ||
bootloader/ | ||
zmk/ | ||
${{ env.tmp_dir }}/modules/ | ||
${{ env.tmp_dir }}/tools/ | ||
${{ env.tmp_dir }}/zephyr/ | ||
${{ env.tmp_dir }}/bootloader/ | ||
${{ env.tmp_dir }}/zmk/ | ||
key: ${{ runner.os }}-build-${{ env.cache_name }}-${{ hashFiles('**/west.yml', '**/build.yaml') }} | ||
restore-keys: | | ||
${{ runner.os }}-build-${{ env.cache_name }}- | ||
${{ runner.os }}-build- | ||
${{ runner.os }}- | ||
- name: West Init | ||
run: west init -l "${{ inputs.config_path }}" | ||
working-directory: ${{ env.tmp_dir }} | ||
run: west init -l "${{ env.tmp_config_dir }}" | ||
|
||
- name: West Update | ||
working-directory: ${{ env.tmp_dir }} | ||
run: west update | ||
|
||
- name: West Zephyr export | ||
working-directory: ${{ env.tmp_dir }} | ||
run: west zephyr-export | ||
|
||
- name: West Build (${{ env.display_name }}) | ||
working-directory: ${{ env.tmp_dir }} | ||
shell: sh -x {0} | ||
run: west build -s zmk/app -b "${{ matrix.board }}" -- -DZMK_CONFIG="${GITHUB_WORKSPACE}/${{ inputs.config_path }}" ${{ env.extra_cmake_args }} ${{ matrix.cmake-args }} | ||
run: west build -s zmk/app -d "${{ env.build_dir }}" -b "${{ matrix.board }}" -- -DZMK_CONFIG=${{ env.tmp_config_dir }} ${{ env.extra_cmake_args }} ${{ matrix.cmake-args }} | ||
|
||
- name: ${{ env.display_name }} Kconfig file | ||
run: | | ||
if [ -f build/zephyr/.config ] | ||
if [ -f "${{ env.build_dir }}/zephyr/.config" ] | ||
then | ||
grep -v -e "^#" -e "^$" build/zephyr/.config | sort | ||
grep -v -e "^#" -e "^$" "${{ env.build_dir }}/zephyr/.config" | sort | ||
else | ||
echo "No Kconfig output" | ||
fi | ||
if: ${{ !cancelled() }} | ||
|
||
- name: ${{ env.display_name }} Devicetree file | ||
run: | | ||
if [ -f build/zephyr/zephyr.dts ] | ||
if [ -f "${{ env.build_dir }}/zephyr/zephyr.dts" ] | ||
then | ||
cat build/zephyr/zephyr.dts | ||
elif [ -f build/zephyr/zephyr.dts.pre ] | ||
cat "${{ env.build_dir }}/zephyr/zephyr.dts" | ||
elif [ -f "${{ env.build_dir }}/zephyr/zephyr.dts.pre" ] | ||
then | ||
cat -s build/zephyr/zephyr.dts.pre | ||
cat -s "${{ env.build_dir }}/zephyr/zephyr.dts.pre" | ||
else | ||
echo "No Devicetree output" | ||
fi | ||
|
@@ -124,17 +144,17 @@ jobs: | |
- name: Rename artifacts | ||
shell: sh -x {0} | ||
run: | | ||
mkdir build/artifacts | ||
if [ -f build/zephyr/zmk.uf2 ] | ||
mkdir "${{ env.build_dir }}/artifacts" | ||
if [ -f "${{ env.build_dir }}/zephyr/zmk.uf2" ] | ||
then | ||
cp build/zephyr/zmk.uf2 "build/artifacts/${{ env.artifact_name }}.uf2" | ||
elif [ -f build/zephyr/zmk.${{ inputs.fallback_binary }} ] | ||
cp "${{ env.build_dir }}/zephyr/zmk.uf2" "${{ env.build_dir }}/artifacts/${{ env.artifact_name }}.uf2" | ||
elif [ -f "${{ env.build_dir }}/zephyr/zmk.${{ inputs.fallback_binary }}" ] | ||
then | ||
cp "build/zephyr/zmk.${{ inputs.fallback_binary }}" "build/artifacts/${{ env.artifact_name }}.${{ inputs.fallback_binary }}" | ||
cp "${{ env.build_dir }}/zephyr/zmk.${{ inputs.fallback_binary }}" "${{ env.build_dir }}/artifacts/${{ env.artifact_name }}.${{ inputs.fallback_binary }}" | ||
fi | ||
- name: Archive (${{ env.display_name }}) | ||
uses: actions/upload-artifact@v3 | ||
with: | ||
name: ${{ inputs.archive_name }} | ||
path: build/artifacts | ||
path: ${{ env.build_dir }}/artifacts |