ClaytonWWilson/miryoku_zmk
1
0
Fork 0
mirror of https://github.com/ClaytonWWilson/miryoku_zmk.git synced 2025-12-13 17:58:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix kconfig for split boards

Browse Source
This commit is contained in:
Manna Harbour 2021-11-01 09:37:12 +11:00
parent ff2bd15e66
commit fbe87f6183
9 changed files with 54 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.github/workflows/build-example-corne-nice_nano.yml vendored
View File

@ -46,7 +46,8 @@ jobs:
shield="" shield=""
fi fi
echo "::set-output name=shield-arg::${SHIELD_ARG}" echo "::set-output name=shield-arg::${SHIELD_ARG}"
keyboard=`echo "$keyboard" | sed 's/_\(left\|right\)//'` keyboard_split="$keyboard"
keyboard_base=`echo "$keyboard" | sed 's/_\(left\|right\)//'`
configfile="${GITHUB_WORKSPACE}/miryoku/config.h" configfile="${GITHUB_WORKSPACE}/miryoku/config.h"
echo '// Copyright 2021 Manna Harbour\n// https://github.com/manna-harbour/miryoku' > "$configfile" echo '// Copyright 2021 Manna Harbour\n// https://github.com/manna-harbour/miryoku' > "$configfile"
@ -72,7 +73,7 @@ jobs:
if [ -n "${{ matrix.kconfig }}" -a "${{ matrix.kconfig }}" != 'default' ] if [ -n "${{ matrix.kconfig }}" -a "${{ matrix.kconfig }}" != 'default' ]
then then
kconfig_file="config/$keyboard.conf" kconfig_file="config/$keyboard_split.conf"
echo "${{ matrix.kconfig }}" > "$kconfig_file" echo "${{ matrix.kconfig }}" > "$kconfig_file"
cat "$kconfig_file" cat "$kconfig_file"
cp "$kconfig_file" "$artifacts_dir" cp "$kconfig_file" "$artifacts_dir"
@ -82,13 +83,13 @@ jobs:
outboard_dir=".github/workflows/outboards" outboard_dir=".github/workflows/outboards"
if [ -n "$shield" ] if [ -n "$shield" ]
then then
outboard_file="$outboard_dir/$keyboard.shield.outboard" outboard_file="$outboard_dir/$keyboard_base.shield.outboard"
else else
outboard_file="$outboard_dir/$keyboard.board.outboard" outboard_file="$outboard_dir/$keyboard_base.board.outboard"
fi fi
if [ ! -f "$outboard_file" ] if [ ! -f "$outboard_file" ]
then then
outboard_file="$outboard_dir/$keyboard.outboard" outboard_file="$outboard_dir/$keyboard_base.outboard"
fi fi
if [ -f "$outboard_file" ] if [ -f "$outboard_file" ]
then then

11
.github/workflows/build-example-tbkmini-nice_nano_v2.yml vendored
View File

@ -46,7 +46,8 @@ jobs:
shield="" shield=""
fi fi
echo "::set-output name=shield-arg::${SHIELD_ARG}" echo "::set-output name=shield-arg::${SHIELD_ARG}"
keyboard=`echo "$keyboard" | sed 's/_\(left\|right\)//'` keyboard_split="$keyboard"
keyboard_base=`echo "$keyboard" | sed 's/_\(left\|right\)//'`
configfile="${GITHUB_WORKSPACE}/miryoku/config.h" configfile="${GITHUB_WORKSPACE}/miryoku/config.h"
echo '// Copyright 2021 Manna Harbour\n// https://github.com/manna-harbour/miryoku' > "$configfile" echo '// Copyright 2021 Manna Harbour\n// https://github.com/manna-harbour/miryoku' > "$configfile"
@ -72,7 +73,7 @@ jobs:
if [ -n "${{ matrix.kconfig }}" -a "${{ matrix.kconfig }}" != 'default' ] if [ -n "${{ matrix.kconfig }}" -a "${{ matrix.kconfig }}" != 'default' ]
then then
kconfig_file="config/$keyboard.conf" kconfig_file="config/$keyboard_split.conf"
echo "${{ matrix.kconfig }}" > "$kconfig_file" echo "${{ matrix.kconfig }}" > "$kconfig_file"
cat "$kconfig_file" cat "$kconfig_file"
cp "$kconfig_file" "$artifacts_dir" cp "$kconfig_file" "$artifacts_dir"
@ -82,13 +83,13 @@ jobs:
outboard_dir=".github/workflows/outboards" outboard_dir=".github/workflows/outboards"
if [ -n "$shield" ] if [ -n "$shield" ]
then then
outboard_file="$outboard_dir/$keyboard.shield.outboard" outboard_file="$outboard_dir/$keyboard_base.shield.outboard"
else else
outboard_file="$outboard_dir/$keyboard.board.outboard" outboard_file="$outboard_dir/$keyboard_base.board.outboard"
fi fi
if [ ! -f "$outboard_file" ] if [ ! -f "$outboard_file" ]
then then
outboard_file="$outboard_dir/$keyboard.outboard" outboard_file="$outboard_dir/$keyboard_base.outboard"
fi fi
if [ -f "$outboard_file" ] if [ -f "$outboard_file" ]
then then

11
.github/workflows/build-inputs.yml vendored
View File

@ -98,7 +98,8 @@ jobs:
shield="" shield=""
fi fi
echo "::set-output name=shield-arg::${SHIELD_ARG}" echo "::set-output name=shield-arg::${SHIELD_ARG}"
keyboard=`echo "$keyboard" | sed 's/_\(left\|right\)//'` keyboard_split="$keyboard"
keyboard_base=`echo "$keyboard" | sed 's/_\(left\|right\)//'`
configfile="${GITHUB_WORKSPACE}/miryoku/config.h" configfile="${GITHUB_WORKSPACE}/miryoku/config.h"
echo '// Copyright 2021 Manna Harbour\n// https://github.com/manna-harbour/miryoku' > "$configfile" echo '// Copyright 2021 Manna Harbour\n// https://github.com/manna-harbour/miryoku' > "$configfile"
@ -124,7 +125,7 @@ jobs:
if [ -n "${{ matrix.kconfig }}" -a "${{ matrix.kconfig }}" != 'default' ] if [ -n "${{ matrix.kconfig }}" -a "${{ matrix.kconfig }}" != 'default' ]
then then
kconfig_file="config/$keyboard.conf" kconfig_file="config/$keyboard_split.conf"
echo "${{ matrix.kconfig }}" > "$kconfig_file" echo "${{ matrix.kconfig }}" > "$kconfig_file"
cat "$kconfig_file" cat "$kconfig_file"
cp "$kconfig_file" "$artifacts_dir" cp "$kconfig_file" "$artifacts_dir"
@ -134,13 +135,13 @@ jobs:
outboard_dir=".github/workflows/outboards" outboard_dir=".github/workflows/outboards"
if [ -n "$shield" ] if [ -n "$shield" ]
then then
outboard_file="$outboard_dir/$keyboard.shield.outboard" outboard_file="$outboard_dir/$keyboard_base.shield.outboard"
else else
outboard_file="$outboard_dir/$keyboard.board.outboard" outboard_file="$outboard_dir/$keyboard_base.board.outboard"
fi fi
if [ ! -f "$outboard_file" ] if [ ! -f "$outboard_file" ]
then then
outboard_file="$outboard_dir/$keyboard.outboard" outboard_file="$outboard_dir/$keyboard_base.outboard"
fi fi
if [ -f "$outboard_file" ] if [ -f "$outboard_file" ]
then then

11
.github/workflows/src/include/build-steps.yml.m4 vendored
View File

@ -14,7 +14,8 @@
shield="" shield=""
fi fi
echo "::set-output name=shield-arg::${SHIELD_ARG}" echo "::set-output name=shield-arg::${SHIELD_ARG}"
keyboard=`echo "$keyboard" | sed 's/_\(left\|right\)//'` keyboard_split="$keyboard"
keyboard_base=`echo "$keyboard" | sed 's/_\(left\|right\)//'`
configfile="${GITHUB_WORKSPACE}/miryoku/config.h" configfile="${GITHUB_WORKSPACE}/miryoku/config.h"
echo '// Copyright 2021 Manna Harbour\n// https://github.com/manna-harbour/miryoku' > "$configfile" echo '// Copyright 2021 Manna Harbour\n// https://github.com/manna-harbour/miryoku' > "$configfile"
@ -40,7 +41,7 @@
if [ -n "${{ matrix.kconfig }}" -a "${{ matrix.kconfig }}" != 'default' ] if [ -n "${{ matrix.kconfig }}" -a "${{ matrix.kconfig }}" != 'default' ]
then then
kconfig_file="config/$keyboard.conf" kconfig_file="config/$keyboard_split.conf"
echo "${{ matrix.kconfig }}" > "$kconfig_file" echo "${{ matrix.kconfig }}" > "$kconfig_file"
cat "$kconfig_file" cat "$kconfig_file"
cp "$kconfig_file" "$artifacts_dir" cp "$kconfig_file" "$artifacts_dir"
@ -50,13 +51,13 @@
outboard_dir=".github/workflows/outboards" outboard_dir=".github/workflows/outboards"
if [ -n "$shield" ] if [ -n "$shield" ]
then then
outboard_file="$outboard_dir/$keyboard.shield.outboard" outboard_file="$outboard_dir/$keyboard_base.shield.outboard"
else else
outboard_file="$outboard_dir/$keyboard.board.outboard" outboard_file="$outboard_dir/$keyboard_base.board.outboard"
fi fi
if [ ! -f "$outboard_file" ] if [ ! -f "$outboard_file" ]
then then
outboard_file="$outboard_dir/$keyboard.outboard" outboard_file="$outboard_dir/$keyboard_base.outboard"
fi fi
if [ -f "$outboard_file" ] if [ -f "$outboard_file" ]
then then

11
.github/workflows/test-boards.yml vendored
View File

@ -52,7 +52,8 @@ jobs:
shield="" shield=""
fi fi
echo "::set-output name=shield-arg::${SHIELD_ARG}" echo "::set-output name=shield-arg::${SHIELD_ARG}"
keyboard=`echo "$keyboard" | sed 's/_\(left\|right\)//'` keyboard_split="$keyboard"
keyboard_base=`echo "$keyboard" | sed 's/_\(left\|right\)//'`
configfile="${GITHUB_WORKSPACE}/miryoku/config.h" configfile="${GITHUB_WORKSPACE}/miryoku/config.h"
echo '// Copyright 2021 Manna Harbour\n// https://github.com/manna-harbour/miryoku' > "$configfile" echo '// Copyright 2021 Manna Harbour\n// https://github.com/manna-harbour/miryoku' > "$configfile"
@ -78,7 +79,7 @@ jobs:
if [ -n "${{ matrix.kconfig }}" -a "${{ matrix.kconfig }}" != 'default' ] if [ -n "${{ matrix.kconfig }}" -a "${{ matrix.kconfig }}" != 'default' ]
then then
kconfig_file="config/$keyboard.conf" kconfig_file="config/$keyboard_split.conf"
echo "${{ matrix.kconfig }}" > "$kconfig_file" echo "${{ matrix.kconfig }}" > "$kconfig_file"
cat "$kconfig_file" cat "$kconfig_file"
cp "$kconfig_file" "$artifacts_dir" cp "$kconfig_file" "$artifacts_dir"
@ -88,13 +89,13 @@ jobs:
outboard_dir=".github/workflows/outboards" outboard_dir=".github/workflows/outboards"
if [ -n "$shield" ] if [ -n "$shield" ]
then then
outboard_file="$outboard_dir/$keyboard.shield.outboard" outboard_file="$outboard_dir/$keyboard_base.shield.outboard"
else else
outboard_file="$outboard_dir/$keyboard.board.outboard" outboard_file="$outboard_dir/$keyboard_base.board.outboard"
fi fi
if [ ! -f "$outboard_file" ] if [ ! -f "$outboard_file" ]
then then
outboard_file="$outboard_dir/$keyboard.outboard" outboard_file="$outboard_dir/$keyboard_base.outboard"
fi fi
if [ -f "$outboard_file" ] if [ -f "$outboard_file" ]
then then

11
.github/workflows/test-build.yml vendored
View File

@ -50,7 +50,8 @@ jobs:
shield="" shield=""
fi fi
echo "::set-output name=shield-arg::${SHIELD_ARG}" echo "::set-output name=shield-arg::${SHIELD_ARG}"
keyboard=`echo "$keyboard" | sed 's/_\(left\|right\)//'` keyboard_split="$keyboard"
keyboard_base=`echo "$keyboard" | sed 's/_\(left\|right\)//'`
configfile="${GITHUB_WORKSPACE}/miryoku/config.h" configfile="${GITHUB_WORKSPACE}/miryoku/config.h"
echo '// Copyright 2021 Manna Harbour\n// https://github.com/manna-harbour/miryoku' > "$configfile" echo '// Copyright 2021 Manna Harbour\n// https://github.com/manna-harbour/miryoku' > "$configfile"
@ -76,7 +77,7 @@ jobs:
if [ -n "${{ matrix.kconfig }}" -a "${{ matrix.kconfig }}" != 'default' ] if [ -n "${{ matrix.kconfig }}" -a "${{ matrix.kconfig }}" != 'default' ]
then then
kconfig_file="config/$keyboard.conf" kconfig_file="config/$keyboard_split.conf"
echo "${{ matrix.kconfig }}" > "$kconfig_file" echo "${{ matrix.kconfig }}" > "$kconfig_file"
cat "$kconfig_file" cat "$kconfig_file"
cp "$kconfig_file" "$artifacts_dir" cp "$kconfig_file" "$artifacts_dir"
@ -86,13 +87,13 @@ jobs:
outboard_dir=".github/workflows/outboards" outboard_dir=".github/workflows/outboards"
if [ -n "$shield" ] if [ -n "$shield" ]
then then
outboard_file="$outboard_dir/$keyboard.shield.outboard" outboard_file="$outboard_dir/$keyboard_base.shield.outboard"
else else
outboard_file="$outboard_dir/$keyboard.board.outboard" outboard_file="$outboard_dir/$keyboard_base.board.outboard"
fi fi
if [ ! -f "$outboard_file" ] if [ ! -f "$outboard_file" ]
then then
outboard_file="$outboard_dir/$keyboard.outboard" outboard_file="$outboard_dir/$keyboard_base.outboard"
fi fi
if [ -f "$outboard_file" ] if [ -f "$outboard_file" ]
then then

11
.github/workflows/test-configs.yml vendored
View File

@ -57,7 +57,8 @@ jobs:
shield="" shield=""
fi fi
echo "::set-output name=shield-arg::${SHIELD_ARG}" echo "::set-output name=shield-arg::${SHIELD_ARG}"
keyboard=`echo "$keyboard" | sed 's/_\(left\|right\)//'` keyboard_split="$keyboard"
keyboard_base=`echo "$keyboard" | sed 's/_\(left\|right\)//'`
configfile="${GITHUB_WORKSPACE}/miryoku/config.h" configfile="${GITHUB_WORKSPACE}/miryoku/config.h"
echo '// Copyright 2021 Manna Harbour\n// https://github.com/manna-harbour/miryoku' > "$configfile" echo '// Copyright 2021 Manna Harbour\n// https://github.com/manna-harbour/miryoku' > "$configfile"
@ -83,7 +84,7 @@ jobs:
if [ -n "${{ matrix.kconfig }}" -a "${{ matrix.kconfig }}" != 'default' ] if [ -n "${{ matrix.kconfig }}" -a "${{ matrix.kconfig }}" != 'default' ]
then then
kconfig_file="config/$keyboard.conf" kconfig_file="config/$keyboard_split.conf"
echo "${{ matrix.kconfig }}" > "$kconfig_file" echo "${{ matrix.kconfig }}" > "$kconfig_file"
cat "$kconfig_file" cat "$kconfig_file"
cp "$kconfig_file" "$artifacts_dir" cp "$kconfig_file" "$artifacts_dir"
@ -93,13 +94,13 @@ jobs:
outboard_dir=".github/workflows/outboards" outboard_dir=".github/workflows/outboards"
if [ -n "$shield" ] if [ -n "$shield" ]
then then
outboard_file="$outboard_dir/$keyboard.shield.outboard" outboard_file="$outboard_dir/$keyboard_base.shield.outboard"
else else
outboard_file="$outboard_dir/$keyboard.board.outboard" outboard_file="$outboard_dir/$keyboard_base.board.outboard"
fi fi
if [ ! -f "$outboard_file" ] if [ ! -f "$outboard_file" ]
then then
outboard_file="$outboard_dir/$keyboard.outboard" outboard_file="$outboard_dir/$keyboard_base.outboard"
fi fi
if [ -f "$outboard_file" ] if [ -f "$outboard_file" ]
then then

11
.github/workflows/test-controllers.yml vendored
View File

@ -50,7 +50,8 @@ jobs:
shield="" shield=""
fi fi
echo "::set-output name=shield-arg::${SHIELD_ARG}" echo "::set-output name=shield-arg::${SHIELD_ARG}"
keyboard=`echo "$keyboard" | sed 's/_\(left\|right\)//'` keyboard_split="$keyboard"
keyboard_base=`echo "$keyboard" | sed 's/_\(left\|right\)//'`
configfile="${GITHUB_WORKSPACE}/miryoku/config.h" configfile="${GITHUB_WORKSPACE}/miryoku/config.h"
echo '// Copyright 2021 Manna Harbour\n// https://github.com/manna-harbour/miryoku' > "$configfile" echo '// Copyright 2021 Manna Harbour\n// https://github.com/manna-harbour/miryoku' > "$configfile"
@ -76,7 +77,7 @@ jobs:
if [ -n "${{ matrix.kconfig }}" -a "${{ matrix.kconfig }}" != 'default' ] if [ -n "${{ matrix.kconfig }}" -a "${{ matrix.kconfig }}" != 'default' ]
then then
kconfig_file="config/$keyboard.conf" kconfig_file="config/$keyboard_split.conf"
echo "${{ matrix.kconfig }}" > "$kconfig_file" echo "${{ matrix.kconfig }}" > "$kconfig_file"
cat "$kconfig_file" cat "$kconfig_file"
cp "$kconfig_file" "$artifacts_dir" cp "$kconfig_file" "$artifacts_dir"
@ -86,13 +87,13 @@ jobs:
outboard_dir=".github/workflows/outboards" outboard_dir=".github/workflows/outboards"
if [ -n "$shield" ] if [ -n "$shield" ]
then then
outboard_file="$outboard_dir/$keyboard.shield.outboard" outboard_file="$outboard_dir/$keyboard_base.shield.outboard"
else else
outboard_file="$outboard_dir/$keyboard.board.outboard" outboard_file="$outboard_dir/$keyboard_base.board.outboard"
fi fi
if [ ! -f "$outboard_file" ] if [ ! -f "$outboard_file" ]
then then
outboard_file="$outboard_dir/$keyboard.outboard" outboard_file="$outboard_dir/$keyboard_base.outboard"
fi fi
if [ -f "$outboard_file" ] if [ -f "$outboard_file" ]
then then

11
.github/workflows/test-shields.yml vendored
View File

@ -102,7 +102,8 @@ jobs:
shield="" shield=""
fi fi
echo "::set-output name=shield-arg::${SHIELD_ARG}" echo "::set-output name=shield-arg::${SHIELD_ARG}"
keyboard=`echo "$keyboard" | sed 's/_\(left\|right\)//'` keyboard_split="$keyboard"
keyboard_base=`echo "$keyboard" | sed 's/_\(left\|right\)//'`
configfile="${GITHUB_WORKSPACE}/miryoku/config.h" configfile="${GITHUB_WORKSPACE}/miryoku/config.h"
echo '// Copyright 2021 Manna Harbour\n// https://github.com/manna-harbour/miryoku' > "$configfile" echo '// Copyright 2021 Manna Harbour\n// https://github.com/manna-harbour/miryoku' > "$configfile"
@ -128,7 +129,7 @@ jobs:
if [ -n "${{ matrix.kconfig }}" -a "${{ matrix.kconfig }}" != 'default' ] if [ -n "${{ matrix.kconfig }}" -a "${{ matrix.kconfig }}" != 'default' ]
then then
kconfig_file="config/$keyboard.conf" kconfig_file="config/$keyboard_split.conf"
echo "${{ matrix.kconfig }}" > "$kconfig_file" echo "${{ matrix.kconfig }}" > "$kconfig_file"
cat "$kconfig_file" cat "$kconfig_file"
cp "$kconfig_file" "$artifacts_dir" cp "$kconfig_file" "$artifacts_dir"
@ -138,13 +139,13 @@ jobs:
outboard_dir=".github/workflows/outboards" outboard_dir=".github/workflows/outboards"
if [ -n "$shield" ] if [ -n "$shield" ]
then then
outboard_file="$outboard_dir/$keyboard.shield.outboard" outboard_file="$outboard_dir/$keyboard_base.shield.outboard"
else else
outboard_file="$outboard_dir/$keyboard.board.outboard" outboard_file="$outboard_dir/$keyboard_base.board.outboard"
fi fi
if [ ! -f "$outboard_file" ] if [ ! -f "$outboard_file" ]
then then
outboard_file="$outboard_dir/$keyboard.outboard" outboard_file="$outboard_dir/$keyboard_base.outboard"
fi fi
if [ -f "$outboard_file" ] if [ -f "$outboard_file" ]
then then