diff --git a/.github/workflows/build-example-corne-nice_nano.yml b/.github/workflows/build-example-corne-nice_nano.yml index 488bb84..2337d84 100644 --- a/.github/workflows/build-example-corne-nice_nano.yml +++ b/.github/workflows/build-example-corne-nice_nano.yml @@ -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 diff --git a/.github/workflows/build-example-tbkmini-nice_nano_v2.yml b/.github/workflows/build-example-tbkmini-nice_nano_v2.yml index d9f1e20..cd222cb 100644 --- a/.github/workflows/build-example-tbkmini-nice_nano_v2.yml +++ b/.github/workflows/build-example-tbkmini-nice_nano_v2.yml @@ -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 diff --git a/.github/workflows/build-inputs.yml b/.github/workflows/build-inputs.yml index 7250e39..e83924a 100644 --- a/.github/workflows/build-inputs.yml +++ b/.github/workflows/build-inputs.yml @@ -98,7 +98,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" @@ -124,7 +125,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" @@ -134,13 +135,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 diff --git a/.github/workflows/src/include/build-steps.yml.m4 b/.github/workflows/src/include/build-steps.yml.m4 index 5e77fc7..c1af0cb 100644 --- a/.github/workflows/src/include/build-steps.yml.m4 +++ b/.github/workflows/src/include/build-steps.yml.m4 @@ -14,7 +14,8 @@ 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" @@ -40,7 +41,7 @@ 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" @@ -50,13 +51,13 @@ 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 diff --git a/.github/workflows/test-boards.yml b/.github/workflows/test-boards.yml index ef4d9ca..b030452 100644 --- a/.github/workflows/test-boards.yml +++ b/.github/workflows/test-boards.yml @@ -52,7 +52,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" @@ -78,7 +79,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" @@ -88,13 +89,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 diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml index a2484cc..1b2566d 100644 --- a/.github/workflows/test-build.yml +++ b/.github/workflows/test-build.yml @@ -50,7 +50,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" @@ -76,7 +77,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" @@ -86,13 +87,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 diff --git a/.github/workflows/test-configs.yml b/.github/workflows/test-configs.yml index a185c4e..6f909ba 100644 --- a/.github/workflows/test-configs.yml +++ b/.github/workflows/test-configs.yml @@ -57,7 +57,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" @@ -83,7 +84,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" @@ -93,13 +94,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 diff --git a/.github/workflows/test-controllers.yml b/.github/workflows/test-controllers.yml index 642636e..d5952cb 100644 --- a/.github/workflows/test-controllers.yml +++ b/.github/workflows/test-controllers.yml @@ -50,7 +50,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" @@ -76,7 +77,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" @@ -86,13 +87,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 diff --git a/.github/workflows/test-shields.yml b/.github/workflows/test-shields.yml index deed7e5..00aadc0 100644 --- a/.github/workflows/test-shields.yml +++ b/.github/workflows/test-shields.yml @@ -102,7 +102,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" @@ -128,7 +129,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" @@ -138,13 +139,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