From 561f1a9e7d88ea405aaecff681d2cd24fcf4fd59 Mon Sep 17 00:00:00 2001
From: Manna Harbour <51143715+manna-harbour@users.noreply.github.com>
Date: Mon, 11 Oct 2021 16:55:24 +1100
Subject: [PATCH] Add ahokore v1 (shield)

- look first for .board/shield.outboard to handle boards/shields with the same name
---
 .../build-example-corne-nice_nano.yml         | 20 +++++++++++++-----
 .../build-example-tbkmini-nice_nano_v2.yml    | 20 +++++++++++++-----
 .github/workflows/build-inputs.yml            | 20 +++++++++++++-----
 ...hokore.outboard => ahokore.board.outboard} |  0
 .../outboards/ahokore.shield.outboard         |  9 ++++++++
 .../workflows/src/include/build-steps.yml.m4  | 20 +++++++++++++-----
 .github/workflows/src/test-shields.yml.m4     |  1 +
 .github/workflows/test-boards.yml             | 20 +++++++++++++-----
 .github/workflows/test-build.yml              | 20 +++++++++++++-----
 .github/workflows/test-configs.yml            | 20 +++++++++++++-----
 .github/workflows/test-controllers.yml        | 20 +++++++++++++-----
 .github/workflows/test-shields.yml            | 21 ++++++++++++++-----
 12 files changed, 146 insertions(+), 45 deletions(-)
 rename .github/workflows/outboards/{ahokore.outboard => ahokore.board.outboard} (100%)
 create mode 100644 .github/workflows/outboards/ahokore.shield.outboard

diff --git a/.github/workflows/build-example-corne-nice_nano.yml b/.github/workflows/build-example-corne-nice_nano.yml
index 7f5de61..488bb84 100644
--- a/.github/workflows/build-example-corne-nice_nano.yml
+++ b/.github/workflows/build-example-corne-nice_nano.yml
@@ -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
diff --git a/.github/workflows/build-example-tbkmini-nice_nano_v2.yml b/.github/workflows/build-example-tbkmini-nice_nano_v2.yml
index f80e9b7..d9f1e20 100644
--- a/.github/workflows/build-example-tbkmini-nice_nano_v2.yml
+++ b/.github/workflows/build-example-tbkmini-nice_nano_v2.yml
@@ -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
diff --git a/.github/workflows/build-inputs.yml b/.github/workflows/build-inputs.yml
index 1426a17..7250e39 100644
--- a/.github/workflows/build-inputs.yml
+++ b/.github/workflows/build-inputs.yml
@@ -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
diff --git a/.github/workflows/outboards/ahokore.outboard b/.github/workflows/outboards/ahokore.board.outboard
similarity index 100%
rename from .github/workflows/outboards/ahokore.outboard
rename to .github/workflows/outboards/ahokore.board.outboard
diff --git a/.github/workflows/outboards/ahokore.shield.outboard b/.github/workflows/outboards/ahokore.shield.outboard
new file mode 100644
index 0000000..c1e3fb3
--- /dev/null
+++ b/.github/workflows/outboards/ahokore.shield.outboard
@@ -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
diff --git a/.github/workflows/src/include/build-steps.yml.m4 b/.github/workflows/src/include/build-steps.yml.m4
index f4d41c7..5e77fc7 100644
--- a/.github/workflows/src/include/build-steps.yml.m4
+++ b/.github/workflows/src/include/build-steps.yml.m4
@@ -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
diff --git a/.github/workflows/src/test-shields.yml.m4 b/.github/workflows/src/test-shields.yml.m4
index e7122ec..e9613f7 100644
--- a/.github/workflows/src/test-shields.yml.m4
+++ b/.github/workflows/src/test-shields.yml.m4
@@ -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
diff --git a/.github/workflows/test-boards.yml b/.github/workflows/test-boards.yml
index a6a99f5..ef4d9ca 100644
--- a/.github/workflows/test-boards.yml
+++ b/.github/workflows/test-boards.yml
@@ -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
diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
index 0a019cd..a2484cc 100644
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -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
diff --git a/.github/workflows/test-configs.yml b/.github/workflows/test-configs.yml
index 06e08fd..a185c4e 100644
--- a/.github/workflows/test-configs.yml
+++ b/.github/workflows/test-configs.yml
@@ -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
diff --git a/.github/workflows/test-controllers.yml b/.github/workflows/test-controllers.yml
index 441595e..642636e 100644
--- a/.github/workflows/test-controllers.yml
+++ b/.github/workflows/test-controllers.yml
@@ -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
diff --git a/.github/workflows/test-shields.yml b/.github/workflows/test-shields.yml
index 998ebad..deed7e5 100644
--- a/.github/workflows/test-shields.yml
+++ b/.github/workflows/test-shields.yml
@@ -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