ClaytonWWilson/miryoku_zmk
1
0
Fork 0
mirror of https://github.com/ClaytonWWilson/miryoku_zmk.git synced 2025-12-15 18:38:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add config field to workflows

Browse Source 
- Change kconfig field to append instead of overwrite
This commit is contained in:
Manna Harbour 2022-04-01 14:15:08 +11:00
parent 8c94a94cae
commit 2a3bb97256
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/build-inputs.yml vendored
View File

@ -32,6 +32,10 @@ on:
description: 'Miryoku Mapping' description: 'Miryoku Mapping'
required: false required: false
default: 'default' default: 'default'
config:
description: 'Custom Config'
required: false
default: 'default'
kconfig: kconfig:
description: 'Kconfig' description: 'Kconfig'
required: false required: false
@ -55,6 +59,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 }}
kconfig: ${{ steps.process-inputs.outputs.kconfig }} kconfig: ${{ steps.process-inputs.outputs.kconfig }}
zmk: ${{ steps.process-inputs.outputs.zmk }} zmk: ${{ steps.process-inputs.outputs.zmk }}
merge: ${{ steps.process-inputs.outputs.merge }} merge: ${{ steps.process-inputs.outputs.merge }}
@ -74,6 +79,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 "kconfig" "${{ github.event.inputs.kconfig }}" set-output "kconfig" "${{ github.event.inputs.kconfig }}"
set-output "zmk" "${{ github.event.inputs.zmk }}" set-output "zmk" "${{ github.event.inputs.zmk }}"
set-output "merge" "${{ github.event.inputs.merge }}" set-output "merge" "${{ github.event.inputs.merge }}"
@ -88,6 +94,7 @@ 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 }}
kconfig: ${{ needs.process-inputs.outputs.kconfig }} kconfig: ${{ needs.process-inputs.outputs.kconfig }}
zmk: ${{ needs.process-inputs.outputs.zmk }} zmk: ${{ needs.process-inputs.outputs.zmk }}
merge: ${{ needs.process-inputs.outputs.merge }} merge: ${{ needs.process-inputs.outputs.merge }}

17
.github/workflows/main.yml vendored
View File

@ -26,6 +26,9 @@ on:
mapping: mapping:
type: string type: string
default: '["default"]' default: '["default"]'
config:
type: string
default: '["default"]'
kconfig: kconfig:
type: string type: string
default: '["default"]' default: '["default"]'
@ -51,6 +54,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) }}
kconfig: ${{ fromJSON(inputs.kconfig) }} kconfig: ${{ fromJSON(inputs.kconfig) }}
zmk: ${{ fromJSON(inputs.zmk) }} zmk: ${{ fromJSON(inputs.zmk) }}
merge: ${{ fromJSON(inputs.merge) }} merge: ${{ fromJSON(inputs.merge) }}
@ -77,6 +81,13 @@ jobs:
echo "::set-output name=configfile::$configfile" echo "::set-output name=configfile::$configfile"
artifact_build_name="miryoku_zmk $shield ${{ matrix.board }}" 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 }}" for option in "alphas_${{ matrix.alphas }}" "nav_${{ matrix.nav }}" "clipboard_${{ matrix.clipboard }}" "layers_${{ matrix.layers }}" "mapping_${{ matrix.mapping }}"
do do
case "$option" in case "$option" in
@ -92,14 +103,16 @@ jobs:
artifacts_dir="artifacts" artifacts_dir="artifacts"
echo "::set-output name=artifact-dir::$artifacts_dir" echo "::set-output name=artifact-dir::$artifacts_dir"
mkdir "$artifacts_dir" mkdir "$artifacts_dir"
cp "$configfile" "$artifacts_dir" cp "$configfile" "$artifacts_dir"
cat "$configfile"
if [ -n "${{ matrix.kconfig }}" -a "${{ matrix.kconfig }}" != 'default' ] if [ -n "${{ matrix.kconfig }}" -a "${{ matrix.kconfig }}" != 'default' ]
then then
kconfig_file="config/$keyboard_split.conf" kconfig_file="config/$keyboard_split.conf"
echo "${{ matrix.kconfig }}" > "$kconfig_file" echo "${{ matrix.kconfig }}" >> "$kconfig_file"
cat "$kconfig_file"
cp "$kconfig_file" "$artifacts_dir" cp "$kconfig_file" "$artifacts_dir"
cat "$kconfig_file"
artifact_build_name="$artifact_build_name kconfig_"`echo "${{ matrix.kconfig }}" | md5sum | cut -d ' ' -f 1` artifact_build_name="$artifact_build_name kconfig_"`echo "${{ matrix.kconfig }}" | md5sum | cut -d ' ' -f 1`
fi fi