From 088fe01b9b7ff989f0ac6c04d8d3ffda6007e2a7 Mon Sep 17 00:00:00 2001 From: Michael Rommel Date: Mon, 12 Feb 2024 22:45:23 +0100 Subject: [PATCH 01/17] ci: add path argument for .json --- .github/workflows/draw-zmk.yml | 43 ++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/.github/workflows/draw-zmk.yml b/.github/workflows/draw-zmk.yml index 20ea2bc..cd02ff4 100644 --- a/.github/workflows/draw-zmk.yml +++ b/.github/workflows/draw-zmk.yml @@ -5,43 +5,48 @@ on: workflow_call: inputs: keymap_patterns: - description: "Path specification for keymaps to be parsed" - default: "config/*.keymap" + description: 'Path specification for keymaps to be parsed' + default: 'config/*.keymap' required: false type: string config_path: - description: "Path to the keymap-drawer configuration file, ignored if non-existent" - default: "keymap_drawer.config.yaml" + description: 'Path to the keymap-drawer configuration file, ignored if non-existent' + default: 'keymap_drawer.config.yaml' required: false type: string output_folder: - description: "Output folder for SVG and YAML files" - default: "keymap-drawer" + description: 'Output folder for SVG and YAML files' + default: 'keymap-drawer' + required: false + type: string + json_path: + description: 'Path to the .json layout configuration file, ignored if non-existent' + default: 'config' required: false type: string parse_args: description: "Map of keyboard names to extra `keymap parse` args, e.g. `corne:'--layer-names Def Lwr Rse Fun'`" - default: "" + default: '' required: false type: string draw_args: description: "Map of keyboard names to extra `keymap draw` args, e.g. `corne:'-k corne_rotated -l LAYOUT_split_3x5_3'`" - default: "" + default: '' required: false type: string commit_message: - description: "Commit message for updated images. Ignored if `amend_commit` is `true`." - default: "keymap-drawer render" + description: 'Commit message for updated images. Ignored if `amend_commit` is `true`.' + default: 'keymap-drawer render' required: false type: string amend_commit: - description: "Whether to amend the last commit instead of creating a new one. Make sure you understand the implications of rewriting the branch history if you use this option!" + description: 'Whether to amend the last commit instead of creating a new one. Make sure you understand the implications of rewriting the branch history if you use this option!' default: false required: false type: boolean install_branch: - description: "Install keymap-drawer from a git branch, use empty for pypi release (default)" - default: "" + description: 'Install keymap-drawer from a git branch, use empty for pypi release (default)' + default: '' required: false type: string @@ -97,9 +102,11 @@ jobs: draw_args=$(get_args "${{ inputs.draw_args }}" "$keyboard") echo "INFO: got extra draw args: $draw_args" - if [ -f "config/${keyboard}.json" ]; then - echo "INFO: found config/${keyboard}.json"; - draw_args+=" -j config/${keyboard}.json" + json_path="${{ inputs.json_path }}" + [ -e "$json_path" ] && json_dir="$json_path") + if [ -f "${json_dir:-config}/${keyboard}.json" ]; then + echo "INFO: found ${json_dir:-config}/${keyboard}.json"; + draw_args+=" -j ${json_dir:-config}/${keyboard}.json" fi keymap "${config_arg[@]}" parse -z "$keymap_file" $parse_args >"${{ inputs.output_folder }}/$keyboard.yaml" \ @@ -116,13 +123,13 @@ jobs: - name: Commit updated images uses: stefanzweifel/git-auto-commit-action@v5 with: - file_pattern: "${{ inputs.output_folder }}/*.svg ${{ inputs.output_folder }}/*.yaml" + file_pattern: '${{ inputs.output_folder }}/*.svg ${{ inputs.output_folder }}/*.yaml' # So the previous commit is amended instead of creating a new one when desired # See: # - https://github.com/stefanzweifel/git-auto-commit-action#using---amend-and---no-edit-as-commit-options # - https://github.com/stefanzweifel/git-auto-commit-action/issues/159#issuecomment-845347950 # - https://github.com/actions/checkout - commit_message: "${{ (inputs.amend_commit == true && steps.last_commit_message.outputs.msg) || inputs.commit_message }}" + commit_message: '${{ (inputs.amend_commit == true && steps.last_commit_message.outputs.msg) || inputs.commit_message }}' commit_options: "${{ (inputs.amend_commit == true && '--amend --no-edit') || '' }}" push_options: "${{ (inputs.amend_commit == true && '--force-with-lease') || '' }}" skip_fetch: ${{ inputs.amend_commit == true }} From b99369e2947930af99694d634c1aba3f54744ac7 Mon Sep 17 00:00:00 2001 From: Michael Rommel Date: Mon, 12 Feb 2024 23:18:04 +0100 Subject: [PATCH 02/17] fix: erroneous parens --- .github/workflows/draw-zmk.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/draw-zmk.yml b/.github/workflows/draw-zmk.yml index cd02ff4..2643053 100644 --- a/.github/workflows/draw-zmk.yml +++ b/.github/workflows/draw-zmk.yml @@ -103,7 +103,7 @@ jobs: echo "INFO: got extra draw args: $draw_args" json_path="${{ inputs.json_path }}" - [ -e "$json_path" ] && json_dir="$json_path") + [ -e "$json_path" ] && json_dir="$json_path" if [ -f "${json_dir:-config}/${keyboard}.json" ]; then echo "INFO: found ${json_dir:-config}/${keyboard}.json"; draw_args+=" -j ${json_dir:-config}/${keyboard}.json" From 4542daed10e997122ea6cfe01fb5674f8a34faf6 Mon Sep 17 00:00:00 2001 From: Michael Rommel Date: Tue, 13 Feb 2024 22:47:52 +0100 Subject: [PATCH 03/17] Update .github/workflows/draw-zmk.yml Co-authored-by: Cem Aksoylar --- .github/workflows/draw-zmk.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/draw-zmk.yml b/.github/workflows/draw-zmk.yml index 2643053..d868fc6 100644 --- a/.github/workflows/draw-zmk.yml +++ b/.github/workflows/draw-zmk.yml @@ -103,10 +103,9 @@ jobs: echo "INFO: got extra draw args: $draw_args" json_path="${{ inputs.json_path }}" - [ -e "$json_path" ] && json_dir="$json_path" - if [ -f "${json_dir:-config}/${keyboard}.json" ]; then - echo "INFO: found ${json_dir:-config}/${keyboard}.json"; - draw_args+=" -j ${json_dir:-config}/${keyboard}.json" + if [ -f "$json_path/${keyboard}.json" ]; then + echo "INFO: found $json_path/${keyboard}.json"; + draw_args+=" -j $json_path/${keyboard}.json" fi keymap "${config_arg[@]}" parse -z "$keymap_file" $parse_args >"${{ inputs.output_folder }}/$keyboard.yaml" \ From c13178258e3c3f7ac4fd26b15f31cfcec8c92e4d Mon Sep 17 00:00:00 2001 From: Michael Rommel Date: Wed, 14 Feb 2024 19:31:55 +0100 Subject: [PATCH 04/17] feat: upload artifacts --- .github/workflows/draw-zmk.yml | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/.github/workflows/draw-zmk.yml b/.github/workflows/draw-zmk.yml index d868fc6..1b42a5b 100644 --- a/.github/workflows/draw-zmk.yml +++ b/.github/workflows/draw-zmk.yml @@ -49,6 +49,11 @@ on: default: '' required: false type: string + destination: + description: 'Add the output files to a commit, as artifacts or both, values: `commit`, `artifact`, `both`' + default: 'commit' + required: false + type: string jobs: draw: @@ -75,6 +80,7 @@ jobs: run: python3 -m pip install "git+https://github.com/caksoylar/keymap-drawer.git@${{ inputs.install_branch }}" - name: Draw keymaps + id: draw run: | get_args() { local keyboard=$2 @@ -93,6 +99,7 @@ jobs: config_path="${{ inputs.config_path }}" [ -e "$config_path" ] && config_arg=(-c "$config_path") || config_arg=() + FIRST=1 for keymap_file in ${{ inputs.keymap_patterns }}; do keyboard=$(basename -s .keymap "$keymap_file") echo "INFO: drawing for $keyboard" @@ -111,15 +118,21 @@ jobs: keymap "${config_arg[@]}" parse -z "$keymap_file" $parse_args >"${{ inputs.output_folder }}/$keyboard.yaml" \ && keymap "${config_arg[@]}" draw "${{ inputs.output_folder }}/$keyboard.yaml" $draw_args >"${{ inputs.output_folder }}/$keyboard.svg" \ || echo "ERROR: parsing or drawing failed for $keyboard!" + if [[ ${FIRST} -ne 1 ]]; then + OUTPUTS="${OUTPUTS}," + fi + OUTPUTS="${OUTPUTS}\"$keyboard.yaml\",\"$keyboard.svg\"" done + echo "OUTPUTS=[${OUTPUTS}]" >> $GITHUB_OUTPUT - name: Get last commit message id: last_commit_message - if: inputs.amend_commit == true + if: inputs.amend_commit == true && (inputs.destination == 'commit || inputs.destination == 'both') run: | echo "msg=$(git log -1 --pretty=%s)" >> $GITHUB_OUTPUT - name: Commit updated images + if: inputs.destination == 'commit || inputs.destination == 'both' uses: stefanzweifel/git-auto-commit-action@v5 with: file_pattern: '${{ inputs.output_folder }}/*.svg ${{ inputs.output_folder }}/*.yaml' @@ -132,3 +145,10 @@ jobs: commit_options: "${{ (inputs.amend_commit == true && '--amend --no-edit') || '' }}" push_options: "${{ (inputs.amend_commit == true && '--force-with-lease') || '' }}" skip_fetch: ${{ inputs.amend_commit == true }} + + - name: Artifact upload + id: artifact-upload-step + uses: actions/upload-artifact@v4 + with: + name: drawings + path: ${{ fromJSON(steps.draw.outputs.OUTPUTS) }} From d8ce7161fafc0ea1287fba317b69330797a753f3 Mon Sep 17 00:00:00 2001 From: Michael Rommel Date: Wed, 14 Feb 2024 19:37:39 +0100 Subject: [PATCH 05/17] fix: parens error --- .github/workflows/draw-zmk.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/draw-zmk.yml b/.github/workflows/draw-zmk.yml index 1b42a5b..b8f5ba6 100644 --- a/.github/workflows/draw-zmk.yml +++ b/.github/workflows/draw-zmk.yml @@ -132,7 +132,7 @@ jobs: echo "msg=$(git log -1 --pretty=%s)" >> $GITHUB_OUTPUT - name: Commit updated images - if: inputs.destination == 'commit || inputs.destination == 'both' + if: ( inputs.destination == 'commit || inputs.destination == 'both' ) uses: stefanzweifel/git-auto-commit-action@v5 with: file_pattern: '${{ inputs.output_folder }}/*.svg ${{ inputs.output_folder }}/*.yaml' From d1e8fdcd0b2260d288dfb0608dadf11665567bb3 Mon Sep 17 00:00:00 2001 From: Michael Rommel Date: Wed, 14 Feb 2024 19:41:50 +0100 Subject: [PATCH 06/17] fix: missing quote --- .github/workflows/draw-zmk.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/draw-zmk.yml b/.github/workflows/draw-zmk.yml index b8f5ba6..8ff9a79 100644 --- a/.github/workflows/draw-zmk.yml +++ b/.github/workflows/draw-zmk.yml @@ -127,12 +127,12 @@ jobs: - name: Get last commit message id: last_commit_message - if: inputs.amend_commit == true && (inputs.destination == 'commit || inputs.destination == 'both') + if: inputs.amend_commit == true && (inputs.destination == 'commit' || inputs.destination == 'both') run: | echo "msg=$(git log -1 --pretty=%s)" >> $GITHUB_OUTPUT - name: Commit updated images - if: ( inputs.destination == 'commit || inputs.destination == 'both' ) + if: ( inputs.destination == 'commit' || inputs.destination == 'both' ) uses: stefanzweifel/git-auto-commit-action@v5 with: file_pattern: '${{ inputs.output_folder }}/*.svg ${{ inputs.output_folder }}/*.yaml' From 23e4d866663e0122522e59f2024491b857881235 Mon Sep 17 00:00:00 2001 From: Michael Rommel Date: Wed, 14 Feb 2024 19:44:19 +0100 Subject: [PATCH 07/17] fix: put sequence on separate line --- .github/workflows/draw-zmk.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/draw-zmk.yml b/.github/workflows/draw-zmk.yml index 8ff9a79..57d8f73 100644 --- a/.github/workflows/draw-zmk.yml +++ b/.github/workflows/draw-zmk.yml @@ -151,4 +151,5 @@ jobs: uses: actions/upload-artifact@v4 with: name: drawings - path: ${{ fromJSON(steps.draw.outputs.OUTPUTS) }} + path: | + ${{ fromJSON(steps.draw.outputs.OUTPUTS) }} From cd4d28fb546589f87159c78dd1e7ea8d7b49ad9d Mon Sep 17 00:00:00 2001 From: Michael Rommel Date: Wed, 14 Feb 2024 19:49:57 +0100 Subject: [PATCH 08/17] fix: try joining --- .github/workflows/draw-zmk.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/draw-zmk.yml b/.github/workflows/draw-zmk.yml index 57d8f73..6341130 100644 --- a/.github/workflows/draw-zmk.yml +++ b/.github/workflows/draw-zmk.yml @@ -151,5 +151,6 @@ jobs: uses: actions/upload-artifact@v4 with: name: drawings - path: | - ${{ fromJSON(steps.draw.outputs.OUTPUTS) }} + path: |- + ${{ join(fromJSON(steps.draw.outputs.OUTPUTS), ' + ') }} From 4c5e6ba236b61274960fdb2ea3c417f1f0e493ae Mon Sep 17 00:00:00 2001 From: Michael Rommel Date: Wed, 14 Feb 2024 19:53:58 +0100 Subject: [PATCH 09/17] fix: join with newline --- .github/workflows/draw-zmk.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/draw-zmk.yml b/.github/workflows/draw-zmk.yml index 6341130..c2ea052 100644 --- a/.github/workflows/draw-zmk.yml +++ b/.github/workflows/draw-zmk.yml @@ -121,7 +121,7 @@ jobs: if [[ ${FIRST} -ne 1 ]]; then OUTPUTS="${OUTPUTS}," fi - OUTPUTS="${OUTPUTS}\"$keyboard.yaml\",\"$keyboard.svg\"" + OUTPUTS="${OUTPUTS}\"${{ inputs.output_folder }}/$keyboard.yaml\",\"${{ inputs.output_folder }}/$keyboard.svg\"" done echo "OUTPUTS=[${OUTPUTS}]" >> $GITHUB_OUTPUT @@ -151,6 +151,6 @@ jobs: uses: actions/upload-artifact@v4 with: name: drawings - path: |- + path: | ${{ join(fromJSON(steps.draw.outputs.OUTPUTS), ' ') }} From 5f6ed5d04738be098995490d19574b02e8d72dc0 Mon Sep 17 00:00:00 2001 From: Michael Rommel Date: Wed, 14 Feb 2024 20:01:40 +0100 Subject: [PATCH 10/17] fix: define outputs with artifact id --- .github/workflows/draw-zmk.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/draw-zmk.yml b/.github/workflows/draw-zmk.yml index c2ea052..6429084 100644 --- a/.github/workflows/draw-zmk.yml +++ b/.github/workflows/draw-zmk.yml @@ -58,7 +58,8 @@ on: jobs: draw: runs-on: ubuntu-latest - + outputs: + drawings-id: ${{ steps.artifact-upload-step.outputs.artifact-id }} steps: - name: Checkout uses: actions/checkout@v4 From 3aa82695355d459a272b6f81758aad4f2e148e91 Mon Sep 17 00:00:00 2001 From: Michael Rommel Date: Wed, 14 Feb 2024 20:05:20 +0100 Subject: [PATCH 11/17] fix: map jobs output to workflow output --- .github/workflows/draw-zmk.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/draw-zmk.yml b/.github/workflows/draw-zmk.yml index 6429084..0608511 100644 --- a/.github/workflows/draw-zmk.yml +++ b/.github/workflows/draw-zmk.yml @@ -54,6 +54,8 @@ on: default: 'commit' required: false type: string + outputs: + drawings-id: ${{ jobs.draw.outputs.drawings-id }} jobs: draw: From 305bfe006b9d11e6effd96fc06276c6880708a49 Mon Sep 17 00:00:00 2001 From: Michael Rommel Date: Wed, 14 Feb 2024 20:19:58 +0100 Subject: [PATCH 12/17] fix: definition of workflow outputs corrected --- .github/workflows/draw-zmk.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/draw-zmk.yml b/.github/workflows/draw-zmk.yml index 0608511..ef43338 100644 --- a/.github/workflows/draw-zmk.yml +++ b/.github/workflows/draw-zmk.yml @@ -55,7 +55,9 @@ on: required: false type: string outputs: - drawings-id: ${{ jobs.draw.outputs.drawings-id }} + drawings-id: + description: 'Archive with keymap in yaml and drawing in svg formats' + value: ${{ jobs.draw.outputs.drawings-id }} jobs: draw: From be121350e597a3c2af1df5d24d3b64a695aa8645 Mon Sep 17 00:00:00 2001 From: Michael Rommel Date: Wed, 14 Feb 2024 20:52:33 +0100 Subject: [PATCH 13/17] fix: make artifactname configurable --- .github/workflows/draw-zmk.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/draw-zmk.yml b/.github/workflows/draw-zmk.yml index ef43338..d603997 100644 --- a/.github/workflows/draw-zmk.yml +++ b/.github/workflows/draw-zmk.yml @@ -54,6 +54,11 @@ on: default: 'commit' required: false type: string + artifactname: + description: 'Define the name the drawings are stored as an artifact' + default: 'drawings' + required: false + type: string outputs: drawings-id: description: 'Archive with keymap in yaml and drawing in svg formats' @@ -155,7 +160,7 @@ jobs: id: artifact-upload-step uses: actions/upload-artifact@v4 with: - name: drawings + name: '${{ inputs.artifactname }}' path: | ${{ join(fromJSON(steps.draw.outputs.OUTPUTS), ' ') }} From 8698992d03ac034dc8141d44afd03c78a290eae7 Mon Sep 17 00:00:00 2001 From: Michael Rommel Date: Fri, 16 Feb 2024 18:19:51 +0100 Subject: [PATCH 14/17] Apply suggestions from code review Co-authored-by: Cem Aksoylar --- .github/workflows/draw-zmk.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/draw-zmk.yml b/.github/workflows/draw-zmk.yml index ab771a6..1c1687c 100644 --- a/.github/workflows/draw-zmk.yml +++ b/.github/workflows/draw-zmk.yml @@ -54,14 +54,14 @@ on: default: 'commit' required: false type: string - artifactname: - description: 'Define the name the drawings are stored as an artifact' + artifact_name: + description: 'Name of the produced artifact containing SVG and YAML outputs. Ignored if `destination` is `commit`.' default: 'drawings' required: false type: string outputs: drawings-id: - description: 'Archive with keymap in yaml and drawing in svg formats' + description: 'Archive with keymap in YAML and drawing in SVG formats' value: ${{ jobs.draw.outputs.drawings-id }} jobs: @@ -158,6 +158,7 @@ jobs: - name: Artifact upload id: artifact-upload-step + if: ( inputs.destination == 'artifact' || inputs.destination == 'both' ) uses: actions/upload-artifact@v4 with: name: '${{ inputs.artifactname }}' From ba047c9d3e817670d6e34c8b1152f9bbc9fd2a60 Mon Sep 17 00:00:00 2001 From: Michael Rommel Date: Sat, 17 Feb 2024 14:12:01 +0100 Subject: [PATCH 15/17] fix: improve array handling of artifacts, remove -id --- .github/workflows/draw-zmk.yml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/draw-zmk.yml b/.github/workflows/draw-zmk.yml index 1c1687c..f672389 100644 --- a/.github/workflows/draw-zmk.yml +++ b/.github/workflows/draw-zmk.yml @@ -60,15 +60,15 @@ on: required: false type: string outputs: - drawings-id: + drawings: description: 'Archive with keymap in YAML and drawing in SVG formats' - value: ${{ jobs.draw.outputs.drawings-id }} + value: ${{ jobs.draw.outputs.drawings }} jobs: draw: runs-on: ubuntu-latest outputs: - drawings-id: ${{ steps.artifact-upload-step.outputs.artifact-id }} + drawings: ${{ steps.artifact-upload-step.outputs.artifact-id }} steps: - name: Checkout uses: actions/checkout@v4 @@ -105,11 +105,12 @@ jobs: done } + IFS=',' + declare -a DRAWINGS mkdir -p "${{ inputs.output_folder }}" config_path="${{ inputs.config_path }}" [ -e "$config_path" ] && config_arg=(-c "$config_path") || config_arg=() - FIRST=1 for keymap_file in ${{ inputs.keymap_patterns }}; do keyboard=$(basename -s .keymap "$keymap_file") echo "INFO: drawing for $keyboard" @@ -128,12 +129,9 @@ jobs: keymap "${config_arg[@]}" parse -z "$keymap_file" $parse_args >"${{ inputs.output_folder }}/$keyboard.yaml" \ && keymap "${config_arg[@]}" draw "${{ inputs.output_folder }}/$keyboard.yaml" $draw_args >"${{ inputs.output_folder }}/$keyboard.svg" \ || echo "ERROR: parsing or drawing failed for $keyboard!" - if [[ ${FIRST} -ne 1 ]]; then - OUTPUTS="${OUTPUTS}," - fi - OUTPUTS="${OUTPUTS}\"${{ inputs.output_folder }}/$keyboard.yaml\",\"${{ inputs.output_folder }}/$keyboard.svg\"" + DRAWINGS+=(\"${{ inputs.output_folder }}/$keyboard.yaml\" \"${{ inputs.output_folder }}/$keyboard.svg\") done - echo "OUTPUTS=[${OUTPUTS}]" >> $GITHUB_OUTPUT + echo "DRAWINGS=[${DRAWINGS[*]}]" >> $GITHUB_OUTPUT - name: Get last commit message id: last_commit_message @@ -163,5 +161,5 @@ jobs: with: name: '${{ inputs.artifactname }}' path: | - ${{ join(fromJSON(steps.draw.outputs.OUTPUTS), ' + ${{ join(fromJSON(steps.draw.outputs.DRAWINGS), ' ') }} From f77c5d9cda19f6508e967e63a0be223820c1c377 Mon Sep 17 00:00:00 2001 From: Michael Rommel Date: Sat, 17 Feb 2024 14:46:05 +0100 Subject: [PATCH 16/17] Fix IFS usage --- .github/workflows/draw-zmk.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/draw-zmk.yml b/.github/workflows/draw-zmk.yml index f672389..66072e6 100644 --- a/.github/workflows/draw-zmk.yml +++ b/.github/workflows/draw-zmk.yml @@ -105,7 +105,6 @@ jobs: done } - IFS=',' declare -a DRAWINGS mkdir -p "${{ inputs.output_folder }}" @@ -131,8 +130,10 @@ jobs: || echo "ERROR: parsing or drawing failed for $keyboard!" DRAWINGS+=(\"${{ inputs.output_folder }}/$keyboard.yaml\" \"${{ inputs.output_folder }}/$keyboard.svg\") done + IFS=',' echo "DRAWINGS=[${DRAWINGS[*]}]" >> $GITHUB_OUTPUT - + unset IFS + - name: Get last commit message id: last_commit_message if: inputs.amend_commit == true && (inputs.destination == 'commit' || inputs.destination == 'both') From b3a794dfb56277f9a313793942e1d3dd18af489c Mon Sep 17 00:00:00 2001 From: Michael Rommel Date: Sat, 17 Feb 2024 14:51:30 +0100 Subject: [PATCH 17/17] Correct new artifact_name spelling --- .github/workflows/draw-zmk.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/draw-zmk.yml b/.github/workflows/draw-zmk.yml index 66072e6..e33dc07 100644 --- a/.github/workflows/draw-zmk.yml +++ b/.github/workflows/draw-zmk.yml @@ -160,7 +160,7 @@ jobs: if: ( inputs.destination == 'artifact' || inputs.destination == 'both' ) uses: actions/upload-artifact@v4 with: - name: '${{ inputs.artifactname }}' + name: '${{ inputs.artifact_name }}' path: | ${{ join(fromJSON(steps.draw.outputs.DRAWINGS), ' ') }}