diff --git a/.github/actions/merge-partitions/action.yml b/.github/actions/merge-partitions/action.yml index 43734bb2..3a25eefa 100644 --- a/.github/actions/merge-partitions/action.yml +++ b/.github/actions/merge-partitions/action.yml @@ -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' @@ -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 diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index d658c4c8..9ce50ff6 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -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