Skip to content

Commit c696223

Browse files
committed
workflows: fix artifact handling
- Correct how uploaded artifacts are named during the build - Fix artifact-download property that had underscore instead of dash - Update release workflow to use tag without "template_" prefix Signed-off-by: Mike Szczys <mike@golioth.io>
1 parent 6b63ed1 commit c696223

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

.github/workflows/build_zephyr.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,9 @@ jobs:
7878
run: |
7979
cd build
8080
mkdir -p artifacts
81-
BOARD_NICENAME=${{ inputs.BOARD }}
82-
BOARD_NICENAME=${BOARD_NICENAME//\//_}
83-
mv merged.hex ./artifacts/ac_power_monitor_${{ inputs.TAG }}_${BOARD_NICENAME}_full.hex
84-
mv app/zephyr/zephyr.signed.bin ./artifacts/ac_power_monitor_${{ inputs.TAG }}_${BOARD_NICENAME}_update.bin
85-
mv app/zephyr/zephyr.elf ./artifacts/ac_power_monitor_${{ inputs.TAG }}_${BOARD_NICENAME}.elf
81+
mv merged.hex ./artifacts/ac_power_monitor_${{ inputs.TAG }}_${{ steps.nicename.outputs.BOARD_NICENAME }}_full.hex
82+
mv app/zephyr/zephyr.signed.bin ./artifacts/ac_power_monitor_${{ inputs.TAG }}_${{ steps.nicename.outputs.BOARD_NICENAME }}_update.bin
83+
mv app/zephyr/zephyr.elf ./artifacts/ac_power_monitor_${{ inputs.TAG }}_${{ steps.nicename.outputs.BOARD_NICENAME }}.elf
8684
8785
# Run IDs are unique per repo but are reused on re-runs
8886
- name: Save artifact

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
version:
1010
description: 'Release Version.'
1111
required: true
12-
default: 'template_v0.0.0'
12+
default: 'v0.0.0'
1313
type: string
1414

1515
jobs:
@@ -40,7 +40,7 @@ jobs:
4040
with:
4141
pattern: build_artifacts_*
4242
path: ~/artifacts
43-
merge_multiple: true
43+
merge-multiple: true
4444

4545
- name: Create Release manually with GH CLI
4646
run: gh release create --title ${{ inputs.version }} --draft ${{ inputs.version }}

0 commit comments

Comments
 (0)