From 2a3bb97256db384e4d970d06710d033160ac137d Mon Sep 17 00:00:00 2001
From: Manna Harbour <51143715+manna-harbour@users.noreply.github.com>
Date: Fri, 1 Apr 2022 14:15:08 +1100
Subject: [PATCH] Add config field to workflows

- Change kconfig field to append instead of overwrite
---
 .github/workflows/build-inputs.yml |  7 +++++++
 .github/workflows/main.yml         | 17 +++++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-inputs.yml b/.github/workflows/build-inputs.yml
index e942c46..bb34abb 100644
--- a/.github/workflows/build-inputs.yml
+++ b/.github/workflows/build-inputs.yml
@@ -32,6 +32,10 @@ on:
         description: 'Miryoku Mapping'
         required: false
         default: 'default'
+      config:
+        description: 'Custom Config'
+        required: false
+        default: 'default'
       kconfig:
         description: 'Kconfig'
         required: false
@@ -55,6 +59,7 @@ jobs:
       clipboard: ${{ steps.process-inputs.outputs.clipboard }}
       layers: ${{ steps.process-inputs.outputs.layers }}
       mapping: ${{ steps.process-inputs.outputs.mapping }}
+      config: ${{ steps.process-inputs.outputs.config }}
       kconfig: ${{ steps.process-inputs.outputs.kconfig }}
       zmk: ${{ steps.process-inputs.outputs.zmk }}
       merge: ${{ steps.process-inputs.outputs.merge }}
@@ -74,6 +79,7 @@ jobs:
           set-output "clipboard" "${{ github.event.inputs.clipboard }}"
           set-output "layers" "${{ github.event.inputs.layers }}"
           set-output "mapping" "${{ github.event.inputs.mapping }}"
+          set-output "config" "${{ github.event.inputs.config }}"
           set-output "kconfig" "${{ github.event.inputs.kconfig }}"
           set-output "zmk" "${{ github.event.inputs.zmk }}"
           set-output "merge" "${{ github.event.inputs.merge }}"
@@ -88,6 +94,7 @@ jobs:
       clipboard: ${{ needs.process-inputs.outputs.clipboard }}
       layers: ${{ needs.process-inputs.outputs.layers }}
       mapping: ${{ needs.process-inputs.outputs.mapping }}
+      config: ${{ needs.process-inputs.outputs.config }}
       kconfig: ${{ needs.process-inputs.outputs.kconfig }}
       zmk: ${{ needs.process-inputs.outputs.zmk }}
       merge: ${{ needs.process-inputs.outputs.merge }}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e74b594..ba3383e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -26,6 +26,9 @@ on:
       mapping:
         type: string
         default: '["default"]'
+      config:
+        type: string
+        default: '["default"]'
       kconfig:
         type: string
         default: '["default"]'
@@ -51,6 +54,7 @@ jobs:
         clipboard: ${{ fromJSON(inputs.clipboard) }}
         layers: ${{ fromJSON(inputs.layers) }}
         mapping: ${{ fromJSON(inputs.mapping) }}
+        config: ${{ fromJSON(inputs.config) }}
         kconfig: ${{ fromJSON(inputs.kconfig) }}
         zmk: ${{ fromJSON(inputs.zmk) }}
         merge: ${{ fromJSON(inputs.merge) }}
@@ -77,6 +81,13 @@ jobs:
           echo "::set-output name=configfile::$configfile"
 
           artifact_build_name="miryoku_zmk $shield ${{ matrix.board }}"
+
+          if [ -n "${{ matrix.config }}" -a "${{ matrix.config }}" != 'default' ]
+          then
+            echo "${{ matrix.config }}" >> "$configfile"
+            artifact_build_name="$artifact_build_name config_"`echo "${{ matrix.config }}" | md5sum | cut -d ' ' -f 1`
+          fi
+
           for option in "alphas_${{ matrix.alphas }}" "nav_${{ matrix.nav }}" "clipboard_${{ matrix.clipboard }}" "layers_${{ matrix.layers }}" "mapping_${{ matrix.mapping }}"
           do
             case "$option" in
@@ -92,14 +103,16 @@ jobs:
           artifacts_dir="artifacts"
           echo "::set-output name=artifact-dir::$artifacts_dir"
           mkdir "$artifacts_dir"
+
           cp "$configfile" "$artifacts_dir"
+          cat "$configfile"
 
           if [ -n "${{ matrix.kconfig }}" -a "${{ matrix.kconfig }}" != 'default' ]
           then
             kconfig_file="config/$keyboard_split.conf"
-            echo "${{ matrix.kconfig }}" > "$kconfig_file"
-            cat "$kconfig_file"
+            echo "${{ matrix.kconfig }}" >> "$kconfig_file"
             cp "$kconfig_file" "$artifacts_dir"
+            cat "$kconfig_file"
             artifact_build_name="$artifact_build_name kconfig_"`echo "${{ matrix.kconfig }}" | md5sum | cut -d ' ' -f 1`
           fi