Add merge field to workflows

- remove space from matrix element separator
- change key
- remove restore-keys
This commit is contained in:
Manna Harbour
2022-02-14 15:07:03 +11:00
parent 65c9c39f6c
commit 8e6c80f40f
3 changed files with 49 additions and 11 deletions

View File

@@ -36,6 +36,10 @@ on:
description: 'Kconfig'
required: false
default: 'default'
merge:
description: 'ZMK Merge'
required: false
default: 'default'
jobs:
process-inputs:
runs-on: ubuntu-latest
@@ -48,13 +52,14 @@ jobs:
layers: ${{ steps.process-inputs.outputs.layers }}
mapping: ${{ steps.process-inputs.outputs.mapping }}
kconfig: ${{ steps.process-inputs.outputs.kconfig }}
merge: ${{ steps.process-inputs.outputs.merge }}
steps:
- name: Process inputs
id: process-inputs
run: |
set-output()
{
json=`echo "$2" | jq -cnR 'inputs | split("(,| )+";"")'`
json=`echo "$2" | jq -cnR 'inputs | split(",";"")'`
echo "::set-output name=$1::$json"
}
set-output "board" "${{ github.event.inputs.board }}"
@@ -65,6 +70,7 @@ jobs:
set-output "layers" "${{ github.event.inputs.layers }}"
set-output "mapping" "${{ github.event.inputs.mapping }}"
set-output "kconfig" "${{ github.event.inputs.kconfig }}"
set-output "merge" "${{ github.event.inputs.merge }}"
build:
uses: manna-harbour/zmk-config/.github/workflows/main.yml@82f608118a663f0cb02a3cfa4330e21d58b52a4f
needs: process-inputs
@@ -77,3 +83,4 @@ jobs:
layers: ${{ needs.process-inputs.outputs.layers }}
mapping: ${{ needs.process-inputs.outputs.mapping }}
kconfig: ${{ needs.process-inputs.outputs.kconfig }}
merge: ${{ needs.process-inputs.outputs.merge }}