Rename fields in Build Inputs and rename config option to custom_config

This commit is contained in:
Manna Harbour 2022-05-02 21:17:27 +10:00
parent 0e1945f027
commit 634e29bbed
3 changed files with 20 additions and 20 deletions

View File

@ -9,7 +9,7 @@ jobs:
with: with:
board: '["nice_nano"]' board: '["nice_nano"]'
shield: '["corne_left","corne_right"]' shield: '["corne_left","corne_right"]'
config: '["#define MIRYOKU_KLUDEGE_MOUSEKEYSPR"]' cutom_config: '["#define MIRYOKU_KLUDEGE_MOUSEKEYSPR"]'
kconfig: '["CONFIG_ZMK_MOUSE=y"]' kconfig: '["CONFIG_ZMK_MOUSE=y"]'
branches: '[ branches: '[
"zmkfirmware/zmk/main krikun98/zmk/mouse-pr", "zmkfirmware/zmk/main krikun98/zmk/mouse-pr",

View File

@ -6,42 +6,42 @@ on:
workflow_dispatch: workflow_dispatch:
inputs: inputs:
board: board:
description: 'Board' description: 'board'
required: true required: true
shield: shield:
description: 'Shield' description: 'shield'
required: false required: false
default: 'default' default: 'default'
alphas: alphas:
description: 'Miryoku Alphas' description: 'alphas'
required: false required: false
default: 'default' default: 'default'
nav: nav:
description: 'Miryoku Nav' description: 'nav'
required: false required: false
default: 'default' default: 'default'
clipboard: clipboard:
description: 'Miryoku Clipboard' description: 'clipboard'
required: false required: false
default: 'default' default: 'default'
layers: layers:
description: 'Miryoku Layers' description: 'layers'
required: false required: false
default: 'default' default: 'default'
mapping: mapping:
description: 'Miryoku Mapping' description: 'mapping'
required: false required: false
default: 'default' default: 'default'
config: cutom_config:
description: 'Custom Config' description: 'custom_config'
required: false required: false
default: 'default' default: 'default'
kconfig: kconfig:
description: 'Kconfig' description: 'kconfig'
required: false required: false
default: 'default' default: 'default'
branches: branches:
description: 'ZMK Branches' description: 'branches'
required: false required: false
default: 'default' default: 'default'
jobs: jobs:
@ -55,7 +55,7 @@ jobs:
clipboard: ${{ steps.process-inputs.outputs.clipboard }} clipboard: ${{ steps.process-inputs.outputs.clipboard }}
layers: ${{ steps.process-inputs.outputs.layers }} layers: ${{ steps.process-inputs.outputs.layers }}
mapping: ${{ steps.process-inputs.outputs.mapping }} mapping: ${{ steps.process-inputs.outputs.mapping }}
config: ${{ steps.process-inputs.outputs.config }} cutom_config: ${{ steps.process-inputs.outputs.cutom_config }}
kconfig: ${{ steps.process-inputs.outputs.kconfig }} kconfig: ${{ steps.process-inputs.outputs.kconfig }}
branches: ${{ steps.process-inputs.outputs.branches }} branches: ${{ steps.process-inputs.outputs.branches }}
steps: steps:
@ -74,7 +74,7 @@ jobs:
set-output "clipboard" "${{ github.event.inputs.clipboard }}" set-output "clipboard" "${{ github.event.inputs.clipboard }}"
set-output "layers" "${{ github.event.inputs.layers }}" set-output "layers" "${{ github.event.inputs.layers }}"
set-output "mapping" "${{ github.event.inputs.mapping }}" set-output "mapping" "${{ github.event.inputs.mapping }}"
set-output "config" "${{ github.event.inputs.config }}" set-output "cutom_config" "${{ github.event.inputs.cutom_config }}"
set-output "kconfig" "${{ github.event.inputs.kconfig }}" set-output "kconfig" "${{ github.event.inputs.kconfig }}"
set-output "branches" "${{ github.event.inputs.branches }}" set-output "branches" "${{ github.event.inputs.branches }}"
build: build:
@ -88,6 +88,6 @@ jobs:
clipboard: ${{ needs.process-inputs.outputs.clipboard }} clipboard: ${{ needs.process-inputs.outputs.clipboard }}
layers: ${{ needs.process-inputs.outputs.layers }} layers: ${{ needs.process-inputs.outputs.layers }}
mapping: ${{ needs.process-inputs.outputs.mapping }} mapping: ${{ needs.process-inputs.outputs.mapping }}
config: ${{ needs.process-inputs.outputs.config }} cutom_config: ${{ needs.process-inputs.outputs.cutom_config }}
kconfig: ${{ needs.process-inputs.outputs.kconfig }} kconfig: ${{ needs.process-inputs.outputs.kconfig }}
branches: ${{ needs.process-inputs.outputs.branches }} branches: ${{ needs.process-inputs.outputs.branches }}

View File

@ -26,7 +26,7 @@ on:
mapping: mapping:
type: string type: string
default: '["default"]' default: '["default"]'
config: cutom_config:
type: string type: string
default: '["default"]' default: '["default"]'
kconfig: kconfig:
@ -51,7 +51,7 @@ jobs:
clipboard: ${{ fromJSON(inputs.clipboard) }} clipboard: ${{ fromJSON(inputs.clipboard) }}
layers: ${{ fromJSON(inputs.layers) }} layers: ${{ fromJSON(inputs.layers) }}
mapping: ${{ fromJSON(inputs.mapping) }} mapping: ${{ fromJSON(inputs.mapping) }}
config: ${{ fromJSON(inputs.config) }} cutom_config: ${{ fromJSON(inputs.cutom_config) }}
kconfig: ${{ fromJSON(inputs.kconfig) }} kconfig: ${{ fromJSON(inputs.kconfig) }}
branches: ${{ fromJSON(inputs.branches) }} branches: ${{ fromJSON(inputs.branches) }}
steps: steps:
@ -84,10 +84,10 @@ jobs:
artifact_build_name="miryoku_zmk $shield ${{ matrix.board }}" artifact_build_name="miryoku_zmk $shield ${{ matrix.board }}"
if [ -n "${{ matrix.config }}" -a "${{ matrix.config }}" != 'default' ] if [ -n "${{ matrix.cutom_config }}" -a "${{ matrix.cutom_config }}" != 'default' ]
then then
echo "${{ matrix.config }}" >> "$configfile" echo "${{ matrix.cutom_config }}" >> "$configfile"
artifact_build_name="$artifact_build_name config_"`echo "${{ matrix.config }}" | md5sum | cut -d ' ' -f 1` artifact_build_name="$artifact_build_name config_"`echo "${{ matrix.cutom_config }}" | md5sum | cut -d ' ' -f 1`
fi fi
for option in "alphas_${{ matrix.alphas }}" "nav_${{ matrix.nav }}" "clipboard_${{ matrix.clipboard }}" "layers_${{ matrix.layers }}" "mapping_${{ matrix.mapping }}" for option in "alphas_${{ matrix.alphas }}" "nav_${{ matrix.nav }}" "clipboard_${{ matrix.clipboard }}" "layers_${{ matrix.layers }}" "mapping_${{ matrix.mapping }}"