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

Add ahokore v1 (shield)

Browse Source 
- look first for .board/shield.outboard to handle boards/shields with the same name
This commit is contained in:
Manna Harbour 2021-10-11 16:55:24 +11:00
parent eb0409220e
commit 561f1a9e7d
12 changed files with 146 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,14 +79,24 @@ jobs:
artifact_build_name="$artifact_build_name kconfig_"`echo "${{ matrix.kconfig }}" | md5sum | cut -d ' ' -f 1`
fi
outboard_file=".github/workflows/outboards/$keyboard.outboard"
outboard_dir=".github/workflows/outboards"
if [ -n "$shield" ]
then
outboard_file="$outboard_dir/$keyboard.shield.outboard"
else
outboard_file="$outboard_dir/$keyboard.board.outboard"
fi
if [ ! -f "$outboard_file" ]
then
outboard_file="$outboard_dir/$keyboard.outboard"
fi
if [ -f "$outboard_file" ]
then
grep -v '^#' "$outboard_file" >> $GITHUB_ENV
cat "$outboard_file"
cp "$outboard_file" "$artifacts_dir"
fi
echo "::set-output name=outboard_dir::outboard"
echo "::set-output name=outboard_chekout_dir::outboard"
artifact_build_name=`echo $artifact_build_name | tr ' ' '-'`
echo "::set-output name=artifact-build-name::$artifact_build_name"
@ -98,12 +108,12 @@ jobs:
with:
repository: ${{ env.outboard_repository }}
ref: ${{ env.outboard_ref }}
path: ${{ steps.variables.outputs.outboard_dir }}
path: ${{ steps.variables.outputs.outboard_chekout_dir }}
- name: Link outboard
if: ${{ env.outboard_from != '' && env.outboard_to != '' }}
run: |
mkdir -p `dirname "config/${{ env.outboard_to }}"`
ln -sr ${{ steps.variables.outputs.outboard_dir }}/${{ env.outboard_from }} config/${{ env.outboard_to }}
ln -sr ${{ steps.variables.outputs.outboard_chekout_dir }}/${{ env.outboard_from }} config/${{ env.outboard_to }}
- name: Generate outboard manifest
if: ${{ env.outboard_url_base != '' && env.outboard_revision != '' }}
run: |
@ -112,7 +122,7 @@ jobs:
- name: Copy outboard manifest
if: ${{ env.outboard_manifest != '' }}
run: |
cp ${{ steps.variables.outputs.outboard_dir }}/${{ env.outboard_manifest }} config/west.yml
cp ${{ steps.variables.outputs.outboard_chekout_dir }}/${{ env.outboard_manifest }} config/west.yml
cat config/west.yml
- name: Cache west modules
uses: actions/cache@v2

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

@ -79,14 +79,24 @@ jobs:
artifact_build_name="$artifact_build_name kconfig_"`echo "${{ matrix.kconfig }}" | md5sum | cut -d ' ' -f 1`
fi
outboard_file=".github/workflows/outboards/$keyboard.outboard"
outboard_dir=".github/workflows/outboards"
if [ -n "$shield" ]
then
outboard_file="$outboard_dir/$keyboard.shield.outboard"
else
outboard_file="$outboard_dir/$keyboard.board.outboard"
fi
if [ ! -f "$outboard_file" ]
then
outboard_file="$outboard_dir/$keyboard.outboard"
fi
if [ -f "$outboard_file" ]
then
grep -v '^#' "$outboard_file" >> $GITHUB_ENV
cat "$outboard_file"
cp "$outboard_file" "$artifacts_dir"
fi
echo "::set-output name=outboard_dir::outboard"
echo "::set-output name=outboard_chekout_dir::outboard"
artifact_build_name=`echo $artifact_build_name | tr ' ' '-'`
echo "::set-output name=artifact-build-name::$artifact_build_name"
@ -98,12 +108,12 @@ jobs:
with:
repository: ${{ env.outboard_repository }}
ref: ${{ env.outboard_ref }}
path: ${{ steps.variables.outputs.outboard_dir }}
path: ${{ steps.variables.outputs.outboard_chekout_dir }}
- name: Link outboard
if: ${{ env.outboard_from != '' && env.outboard_to != '' }}
run: |
mkdir -p `dirname "config/${{ env.outboard_to }}"`
ln -sr ${{ steps.variables.outputs.outboard_dir }}/${{ env.outboard_from }} config/${{ env.outboard_to }}
ln -sr ${{ steps.variables.outputs.outboard_chekout_dir }}/${{ env.outboard_from }} config/${{ env.outboard_to }}
- name: Generate outboard manifest
if: ${{ env.outboard_url_base != '' && env.outboard_revision != '' }}
run: |
@ -112,7 +122,7 @@ jobs:
- name: Copy outboard manifest
if: ${{ env.outboard_manifest != '' }}
run: |
cp ${{ steps.variables.outputs.outboard_dir }}/${{ env.outboard_manifest }} config/west.yml
cp ${{ steps.variables.outputs.outboard_chekout_dir }}/${{ env.outboard_manifest }} config/west.yml
cat config/west.yml
- name: Cache west modules
uses: actions/cache@v2

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

@ -131,14 +131,24 @@ jobs:
artifact_build_name="$artifact_build_name kconfig_"`echo "${{ matrix.kconfig }}" | md5sum | cut -d ' ' -f 1`
fi
outboard_file=".github/workflows/outboards/$keyboard.outboard"
outboard_dir=".github/workflows/outboards"
if [ -n "$shield" ]
then
outboard_file="$outboard_dir/$keyboard.shield.outboard"
else
outboard_file="$outboard_dir/$keyboard.board.outboard"
fi
if [ ! -f "$outboard_file" ]
then
outboard_file="$outboard_dir/$keyboard.outboard"
fi
if [ -f "$outboard_file" ]
then
grep -v '^#' "$outboard_file" >> $GITHUB_ENV
cat "$outboard_file"
cp "$outboard_file" "$artifacts_dir"
fi
echo "::set-output name=outboard_dir::outboard"
echo "::set-output name=outboard_chekout_dir::outboard"
artifact_build_name=`echo $artifact_build_name | tr ' ' '-'`
echo "::set-output name=artifact-build-name::$artifact_build_name"
@ -150,12 +160,12 @@ jobs:
with:
repository: ${{ env.outboard_repository }}
ref: ${{ env.outboard_ref }}
path: ${{ steps.variables.outputs.outboard_dir }}
path: ${{ steps.variables.outputs.outboard_chekout_dir }}
- name: Link outboard
if: ${{ env.outboard_from != '' && env.outboard_to != '' }}
run: |
mkdir -p `dirname "config/${{ env.outboard_to }}"`
ln -sr ${{ steps.variables.outputs.outboard_dir }}/${{ env.outboard_from }} config/${{ env.outboard_to }}
ln -sr ${{ steps.variables.outputs.outboard_chekout_dir }}/${{ env.outboard_from }} config/${{ env.outboard_to }}
- name: Generate outboard manifest
if: ${{ env.outboard_url_base != '' && env.outboard_revision != '' }}
run: |
@ -164,7 +174,7 @@ jobs:
- name: Copy outboard manifest
if: ${{ env.outboard_manifest != '' }}
run: |
cp ${{ steps.variables.outputs.outboard_dir }}/${{ env.outboard_manifest }} config/west.yml
cp ${{ steps.variables.outputs.outboard_chekout_dir }}/${{ env.outboard_manifest }} config/west.yml
cat config/west.yml
- name: Cache west modules
uses: actions/cache@v2

0
.github/workflows/outboards/ahokore.outboard → .github/workflows/outboards/ahokore.board.outboard vendored
View File

9
.github/workflows/outboards/ahokore.shield.outboard vendored Normal file
View File

@ -0,0 +1,9 @@
# Copyright 2021 Manna Harbour
# https://github.com/manna-harbour/miryoku
# ahokore v1 (shield)
outboard_repository=dezlidezlidezli/zmk-config
outboard_ref=master
outboard_from=config/boards/shields/ahokore
outboard_to=boards/shields/ahokore

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

@ -47,14 +47,24 @@
artifact_build_name="$artifact_build_name kconfig_"`echo "${{ matrix.kconfig }}" | md5sum | cut -d ' ' -f 1`
fi
outboard_file=".github/workflows/outboards/$keyboard.outboard"
outboard_dir=".github/workflows/outboards"
if [ -n "$shield" ]
then
outboard_file="$outboard_dir/$keyboard.shield.outboard"
else
outboard_file="$outboard_dir/$keyboard.board.outboard"
fi
if [ ! -f "$outboard_file" ]
then
outboard_file="$outboard_dir/$keyboard.outboard"
fi
if [ -f "$outboard_file" ]
then
grep -v '^#' "$outboard_file" >> $GITHUB_ENV
cat "$outboard_file"
cp "$outboard_file" "$artifacts_dir"
fi
echo "::set-output name=outboard_dir::outboard"
echo "::set-output name=outboard_chekout_dir::outboard"
artifact_build_name=`echo $artifact_build_name | tr ' ' '-'`
echo "::set-output name=artifact-build-name::$artifact_build_name"
@ -66,12 +76,12 @@
with:
repository: ${{ env.outboard_repository }}
ref: ${{ env.outboard_ref }}
path: ${{ steps.variables.outputs.outboard_dir }}
path: ${{ steps.variables.outputs.outboard_chekout_dir }}
- name: Link outboard
if: ${{ env.outboard_from != '' && env.outboard_to != '' }}
run: |
mkdir -p `dirname "config/${{ env.outboard_to }}"`
ln -sr ${{ steps.variables.outputs.outboard_dir }}/${{ env.outboard_from }} config/${{ env.outboard_to }}
ln -sr ${{ steps.variables.outputs.outboard_chekout_dir }}/${{ env.outboard_from }} config/${{ env.outboard_to }}
- name: Generate outboard manifest
if: ${{ env.outboard_url_base != '' && env.outboard_revision != '' }}
run: |
@ -80,7 +90,7 @@
- name: Copy outboard manifest
if: ${{ env.outboard_manifest != '' }}
run: |
cp ${{ steps.variables.outputs.outboard_dir }}/${{ env.outboard_manifest }} config/west.yml
cp ${{ steps.variables.outputs.outboard_chekout_dir }}/${{ env.outboard_manifest }} config/west.yml
cat config/west.yml
- name: Cache west modules
uses: actions/cache@v2

1
.github/workflows/src/test-shields.yml.m4 vendored
View File

@ -7,6 +7,7 @@ m4_include(include/jobs-build.yml.m4)m4_dnl
- absolem # outboard
- a_dux_left
- a_dux_right
- ahokore # outboard
- bastyl_left # outboard
- bastyl_right # outboard
- bat43 # outboard

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

@ -85,14 +85,24 @@ jobs:
artifact_build_name="$artifact_build_name kconfig_"`echo "${{ matrix.kconfig }}" | md5sum | cut -d ' ' -f 1`
fi
outboard_file=".github/workflows/outboards/$keyboard.outboard"
outboard_dir=".github/workflows/outboards"
if [ -n "$shield" ]
then
outboard_file="$outboard_dir/$keyboard.shield.outboard"
else
outboard_file="$outboard_dir/$keyboard.board.outboard"
fi
if [ ! -f "$outboard_file" ]
then
outboard_file="$outboard_dir/$keyboard.outboard"
fi
if [ -f "$outboard_file" ]
then
grep -v '^#' "$outboard_file" >> $GITHUB_ENV
cat "$outboard_file"
cp "$outboard_file" "$artifacts_dir"
fi
echo "::set-output name=outboard_dir::outboard"
echo "::set-output name=outboard_chekout_dir::outboard"
artifact_build_name=`echo $artifact_build_name | tr ' ' '-'`
echo "::set-output name=artifact-build-name::$artifact_build_name"
@ -104,12 +114,12 @@ jobs:
with:
repository: ${{ env.outboard_repository }}
ref: ${{ env.outboard_ref }}
path: ${{ steps.variables.outputs.outboard_dir }}
path: ${{ steps.variables.outputs.outboard_chekout_dir }}
- name: Link outboard
if: ${{ env.outboard_from != '' && env.outboard_to != '' }}
run: |
mkdir -p `dirname "config/${{ env.outboard_to }}"`
ln -sr ${{ steps.variables.outputs.outboard_dir }}/${{ env.outboard_from }} config/${{ env.outboard_to }}
ln -sr ${{ steps.variables.outputs.outboard_chekout_dir }}/${{ env.outboard_from }} config/${{ env.outboard_to }}
- name: Generate outboard manifest
if: ${{ env.outboard_url_base != '' && env.outboard_revision != '' }}
run: |
@ -118,7 +128,7 @@ jobs:
- name: Copy outboard manifest
if: ${{ env.outboard_manifest != '' }}
run: |
cp ${{ steps.variables.outputs.outboard_dir }}/${{ env.outboard_manifest }} config/west.yml
cp ${{ steps.variables.outputs.outboard_chekout_dir }}/${{ env.outboard_manifest }} config/west.yml
cat config/west.yml
- name: Cache west modules
uses: actions/cache@v2

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

@ -83,14 +83,24 @@ jobs:
artifact_build_name="$artifact_build_name kconfig_"`echo "${{ matrix.kconfig }}" | md5sum | cut -d ' ' -f 1`
fi
outboard_file=".github/workflows/outboards/$keyboard.outboard"
outboard_dir=".github/workflows/outboards"
if [ -n "$shield" ]
then
outboard_file="$outboard_dir/$keyboard.shield.outboard"
else
outboard_file="$outboard_dir/$keyboard.board.outboard"
fi
if [ ! -f "$outboard_file" ]
then
outboard_file="$outboard_dir/$keyboard.outboard"
fi
if [ -f "$outboard_file" ]
then
grep -v '^#' "$outboard_file" >> $GITHUB_ENV
cat "$outboard_file"
cp "$outboard_file" "$artifacts_dir"
fi
echo "::set-output name=outboard_dir::outboard"
echo "::set-output name=outboard_chekout_dir::outboard"
artifact_build_name=`echo $artifact_build_name | tr ' ' '-'`
echo "::set-output name=artifact-build-name::$artifact_build_name"
@ -102,12 +112,12 @@ jobs:
with:
repository: ${{ env.outboard_repository }}
ref: ${{ env.outboard_ref }}
path: ${{ steps.variables.outputs.outboard_dir }}
path: ${{ steps.variables.outputs.outboard_chekout_dir }}
- name: Link outboard
if: ${{ env.outboard_from != '' && env.outboard_to != '' }}
run: |
mkdir -p `dirname "config/${{ env.outboard_to }}"`
ln -sr ${{ steps.variables.outputs.outboard_dir }}/${{ env.outboard_from }} config/${{ env.outboard_to }}
ln -sr ${{ steps.variables.outputs.outboard_chekout_dir }}/${{ env.outboard_from }} config/${{ env.outboard_to }}
- name: Generate outboard manifest
if: ${{ env.outboard_url_base != '' && env.outboard_revision != '' }}
run: |
@ -116,7 +126,7 @@ jobs:
- name: Copy outboard manifest
if: ${{ env.outboard_manifest != '' }}
run: |
cp ${{ steps.variables.outputs.outboard_dir }}/${{ env.outboard_manifest }} config/west.yml
cp ${{ steps.variables.outputs.outboard_chekout_dir }}/${{ env.outboard_manifest }} config/west.yml
cat config/west.yml
- name: Cache west modules
uses: actions/cache@v2

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

@ -90,14 +90,24 @@ jobs:
artifact_build_name="$artifact_build_name kconfig_"`echo "${{ matrix.kconfig }}" | md5sum | cut -d ' ' -f 1`
fi
outboard_file=".github/workflows/outboards/$keyboard.outboard"
outboard_dir=".github/workflows/outboards"
if [ -n "$shield" ]
then
outboard_file="$outboard_dir/$keyboard.shield.outboard"
else
outboard_file="$outboard_dir/$keyboard.board.outboard"
fi
if [ ! -f "$outboard_file" ]
then
outboard_file="$outboard_dir/$keyboard.outboard"
fi
if [ -f "$outboard_file" ]
then
grep -v '^#' "$outboard_file" >> $GITHUB_ENV
cat "$outboard_file"
cp "$outboard_file" "$artifacts_dir"
fi
echo "::set-output name=outboard_dir::outboard"
echo "::set-output name=outboard_chekout_dir::outboard"
artifact_build_name=`echo $artifact_build_name | tr ' ' '-'`
echo "::set-output name=artifact-build-name::$artifact_build_name"
@ -109,12 +119,12 @@ jobs:
with:
repository: ${{ env.outboard_repository }}
ref: ${{ env.outboard_ref }}
path: ${{ steps.variables.outputs.outboard_dir }}
path: ${{ steps.variables.outputs.outboard_chekout_dir }}
- name: Link outboard
if: ${{ env.outboard_from != '' && env.outboard_to != '' }}
run: |
mkdir -p `dirname "config/${{ env.outboard_to }}"`
ln -sr ${{ steps.variables.outputs.outboard_dir }}/${{ env.outboard_from }} config/${{ env.outboard_to }}
ln -sr ${{ steps.variables.outputs.outboard_chekout_dir }}/${{ env.outboard_from }} config/${{ env.outboard_to }}
- name: Generate outboard manifest
if: ${{ env.outboard_url_base != '' && env.outboard_revision != '' }}
run: |
@ -123,7 +133,7 @@ jobs:
- name: Copy outboard manifest
if: ${{ env.outboard_manifest != '' }}
run: |
cp ${{ steps.variables.outputs.outboard_dir }}/${{ env.outboard_manifest }} config/west.yml
cp ${{ steps.variables.outputs.outboard_chekout_dir }}/${{ env.outboard_manifest }} config/west.yml
cat config/west.yml
- name: Cache west modules
uses: actions/cache@v2

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

@ -83,14 +83,24 @@ jobs:
artifact_build_name="$artifact_build_name kconfig_"`echo "${{ matrix.kconfig }}" | md5sum | cut -d ' ' -f 1`
fi
outboard_file=".github/workflows/outboards/$keyboard.outboard"
outboard_dir=".github/workflows/outboards"
if [ -n "$shield" ]
then
outboard_file="$outboard_dir/$keyboard.shield.outboard"
else
outboard_file="$outboard_dir/$keyboard.board.outboard"
fi
if [ ! -f "$outboard_file" ]
then
outboard_file="$outboard_dir/$keyboard.outboard"
fi
if [ -f "$outboard_file" ]
then
grep -v '^#' "$outboard_file" >> $GITHUB_ENV
cat "$outboard_file"
cp "$outboard_file" "$artifacts_dir"
fi
echo "::set-output name=outboard_dir::outboard"
echo "::set-output name=outboard_chekout_dir::outboard"
artifact_build_name=`echo $artifact_build_name | tr ' ' '-'`
echo "::set-output name=artifact-build-name::$artifact_build_name"
@ -102,12 +112,12 @@ jobs:
with:
repository: ${{ env.outboard_repository }}
ref: ${{ env.outboard_ref }}
path: ${{ steps.variables.outputs.outboard_dir }}
path: ${{ steps.variables.outputs.outboard_chekout_dir }}
- name: Link outboard
if: ${{ env.outboard_from != '' && env.outboard_to != '' }}
run: |
mkdir -p `dirname "config/${{ env.outboard_to }}"`
ln -sr ${{ steps.variables.outputs.outboard_dir }}/${{ env.outboard_from }} config/${{ env.outboard_to }}
ln -sr ${{ steps.variables.outputs.outboard_chekout_dir }}/${{ env.outboard_from }} config/${{ env.outboard_to }}
- name: Generate outboard manifest
if: ${{ env.outboard_url_base != '' && env.outboard_revision != '' }}
run: |
@ -116,7 +126,7 @@ jobs:
- name: Copy outboard manifest
if: ${{ env.outboard_manifest != '' }}
run: |
cp ${{ steps.variables.outputs.outboard_dir }}/${{ env.outboard_manifest }} config/west.yml
cp ${{ steps.variables.outputs.outboard_chekout_dir }}/${{ env.outboard_manifest }} config/west.yml
cat config/west.yml
- name: Cache west modules
uses: actions/cache@v2

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

@ -17,6 +17,7 @@ jobs:
- absolem # outboard
- a_dux_left
- a_dux_right
- ahokore # outboard
- bastyl_left # outboard
- bastyl_right # outboard
- bat43 # outboard
@ -134,14 +135,24 @@ jobs:
artifact_build_name="$artifact_build_name kconfig_"`echo "${{ matrix.kconfig }}" | md5sum | cut -d ' ' -f 1`
fi
outboard_file=".github/workflows/outboards/$keyboard.outboard"
outboard_dir=".github/workflows/outboards"
if [ -n "$shield" ]
then
outboard_file="$outboard_dir/$keyboard.shield.outboard"
else
outboard_file="$outboard_dir/$keyboard.board.outboard"
fi
if [ ! -f "$outboard_file" ]
then
outboard_file="$outboard_dir/$keyboard.outboard"
fi
if [ -f "$outboard_file" ]
then
grep -v '^#' "$outboard_file" >> $GITHUB_ENV
cat "$outboard_file"
cp "$outboard_file" "$artifacts_dir"
fi
echo "::set-output name=outboard_dir::outboard"
echo "::set-output name=outboard_chekout_dir::outboard"
artifact_build_name=`echo $artifact_build_name | tr ' ' '-'`
echo "::set-output name=artifact-build-name::$artifact_build_name"
@ -153,12 +164,12 @@ jobs:
with:
repository: ${{ env.outboard_repository }}
ref: ${{ env.outboard_ref }}
path: ${{ steps.variables.outputs.outboard_dir }}
path: ${{ steps.variables.outputs.outboard_chekout_dir }}
- name: Link outboard
if: ${{ env.outboard_from != '' && env.outboard_to != '' }}
run: |
mkdir -p `dirname "config/${{ env.outboard_to }}"`
ln -sr ${{ steps.variables.outputs.outboard_dir }}/${{ env.outboard_from }} config/${{ env.outboard_to }}
ln -sr ${{ steps.variables.outputs.outboard_chekout_dir }}/${{ env.outboard_from }} config/${{ env.outboard_to }}
- name: Generate outboard manifest
if: ${{ env.outboard_url_base != '' && env.outboard_revision != '' }}
run: |
@ -167,7 +178,7 @@ jobs:
- name: Copy outboard manifest
if: ${{ env.outboard_manifest != '' }}
run: |
cp ${{ steps.variables.outputs.outboard_dir }}/${{ env.outboard_manifest }} config/west.yml
cp ${{ steps.variables.outputs.outboard_chekout_dir }}/${{ env.outboard_manifest }} config/west.yml
cat config/west.yml
- name: Cache west modules
uses: actions/cache@v2