Skip to content

Commit

Permalink
Include firmware version in merged CI file (#199)
Browse files Browse the repository at this point in the history
  • Loading branch information
hhvrc authored Feb 10, 2024
1 parent 28f7aee commit 3fb992a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .github/actions/merge-partitions/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ inputs:
python-version:
description: 'Python version to use'
required: true
release-channel:
description: 'Release channel that describes this upload'
version:
description: 'Version of the firmware'
required: true
board:
description: 'Board name to merge partitions for'
Expand Down Expand Up @@ -49,7 +49,7 @@ runs:
shell: bash
run: |
python scripts/merge_image.py ${{ inputs.board }}
mv merged.bin OpenShock_${{ inputs.board }}_${{ inputs.release-channel }}.bin
mv merged.bin OpenShock_${{ inputs.board }}_${{ inputs.version }}.bin
- name: Upload merged firmware binary
uses: actions/upload-artifact@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
- uses: ./.github/actions/merge-partitions
with:
python-version: ${{ env.PYTHON_VERSION }}
release-channel: ${{ needs.getvars.outputs.release-channel }}
version: ${{ needs.getvars.outputs.version }}
board: ${{ matrix.board }}
skip-checkout: true

Expand Down

0 comments on commit 3fb992a

Please sign in to comment.