From 9d6c239c103850cb9bb32fae247fa3ca6387b374 Mon Sep 17 00:00:00 2001
From: Manna Harbour <51143715+manna-harbour@users.noreply.github.com>
Date: Fri, 7 Oct 2022 21:40:51 +1100
Subject: [PATCH] Add multiple shields

- outboards are currently supported on the first shield only
---
 .../build-example-corne-nice_nano_v2-nice_view.yml   | 12 ++++++++++++
 .github/workflows/main.yml                           |  8 ++++----
 readme.org                                           |  1 +
 3 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 .github/workflows/build-example-corne-nice_nano_v2-nice_view.yml

diff --git a/.github/workflows/build-example-corne-nice_nano_v2-nice_view.yml b/.github/workflows/build-example-corne-nice_nano_v2-nice_view.yml
new file mode 100644
index 0000000..78dce60
--- /dev/null
+++ b/.github/workflows/build-example-corne-nice_nano_v2-nice_view.yml
@@ -0,0 +1,12 @@
+# Copyright 2022 Manna Harbour
+# https://github.com/manna-harbour/miryoku
+
+name: 'Build Example corne nice_nano_v2 nice_view'
+on: workflow_dispatch
+jobs:
+  build:
+    uses: ./.github/workflows/main.yml
+    secrets: inherit
+    with:
+      board: '["nice_nano_v2"]'
+      shield: '["corne_left nice_view_adapter nice_view","corne_right nice_view_adapter nice_view"]'
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c867bbe..1d33b44 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -70,9 +70,9 @@ jobs:
 
           if [ -n "${{ matrix.shield }}" -a "${{ matrix.shield }}" != "default" ]
           then
-            SHIELD_ARG="-DSHIELD=${{ matrix.shield }}"
-            keyboard=${{ matrix.shield }}
-            shield=${{ matrix.shield }}
+            SHIELD_ARG="-DSHIELD=\"${{ matrix.shield }}\""
+            shield=`echo ${{ matrix.shield }} | cut -d ' ' -f 1`
+            keyboard="$shield"
           else
             keyboard=${{ matrix.board }}
             shield=""
@@ -90,7 +90,7 @@ jobs:
           cat "$configfile" >> "$tmpfile"
           mv "$tmpfile" "$configfile"
 
-          artifact_build_name="miryoku_zmk $shield ${{ matrix.board }}"
+          artifact_build_name="miryoku_zmk ${{ matrix.shield }} ${{ matrix.board }}"
           hash_length=16
 
           if [ -n "${{ matrix.custom_config }}" -a "${{ matrix.custom_config }}" != 'default' ]
diff --git a/readme.org b/readme.org
index dd485dc..349a02e 100644
--- a/readme.org
+++ b/readme.org
@@ -105,6 +105,7 @@ For composite keyboards (keyboards with a separate controller), enter the keyboa
 
 For split composite keyboards (keyboards with a separate controller on each side), enter the keyboard side name, e.g. ~corne_left~, ~corne_right~, ~cradio_left~, ~cradio_right~.  To build both sides in the same run, enter both keyboard side names separated by a comma, e.g. ~corne_left,corne_right~, ~cradio_left,cradio_right~.
 
+Also use to specify optional non-keyboard shields, e.g. ~nice_view~. Separate multiple shields with space, e.g. ~nice_view_adapter nice_view~, ~corne_left nice_view_adapter nice_view~. To perform multiple builds with multiple shields in the same run, use both comma and space separators, e.g. ~corne_left nice_view_adapter nice_view,corne_right nice_view_adapter nice_view~.
 
 ***** Miryoku Alternative Layout and Mapping Options