Fix kconfig for split boards

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

View File

@@ -46,7 +46,8 @@ jobs:
shield=""
fi
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"
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' ]
then
kconfig_file="config/$keyboard.conf"
kconfig_file="config/$keyboard_split.conf"
echo "${{ matrix.kconfig }}" > "$kconfig_file"
cat "$kconfig_file"
cp "$kconfig_file" "$artifacts_dir"
@@ -82,13 +83,13 @@ jobs:
outboard_dir=".github/workflows/outboards"
if [ -n "$shield" ]
then
outboard_file="$outboard_dir/$keyboard.shield.outboard"
outboard_file="$outboard_dir/$keyboard_base.shield.outboard"
else
outboard_file="$outboard_dir/$keyboard.board.outboard"
outboard_file="$outboard_dir/$keyboard_base.board.outboard"
fi
if [ ! -f "$outboard_file" ]
then
outboard_file="$outboard_dir/$keyboard.outboard"
outboard_file="$outboard_dir/$keyboard_base.outboard"
fi
if [ -f "$outboard_file" ]
then