Skip to content

Commit bfa1f51

Browse files
committed
workflow: Update firmware tagging in build process
Refactor the build workflow to replace 'version' with 'firmware_tag' for consistency in handling firmware versions. Update related steps to ensure the correct tagging of built binaries. Signed-off-by: Chiho Sin <[email protected]>
1 parent 0cd5ea2 commit bfa1f51

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

.github/workflows/fobe_build.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,8 @@ jobs:
255255
prerelease: ${{ steps.strategy.outputs.version_type != 'stable' }}
256256
token: ${{ secrets.GITHUB_TOKEN }}
257257
outputs:
258-
tag_name: ${{ steps.strategy.outputs.tag_name }}
259-
version: ${{ steps.strategy.outputs.original_version }}
258+
release_tag: ${{ steps.strategy.outputs.release_name }}
259+
firmware_tag: ${{ needs.version.outputs.firmware_tag }}
260260
continue: ${{ steps.check_release.outputs.continue }}
261261

262262
build-esp32:
@@ -272,8 +272,8 @@ jobs:
272272
repo_ref: ${{ github.sha }}
273273
port: esp32
274274
board: ${{ matrix.board }}
275-
version: ${{ needs.create-release.outputs.version }}
276-
release_tag: ${{ needs.create-release.outputs.tag_name }}
275+
firmware_tag: ${{ needs.create-release.outputs.firmware_tag }}
276+
release_tag: ${{ needs.create-release.outputs.release_tag }}
277277
secrets: inherit
278278

279279
build-nrf:
@@ -289,6 +289,6 @@ jobs:
289289
repo_ref: ${{ github.sha }}
290290
port: nrf
291291
board: ${{ matrix.board }}
292-
version: ${{ needs.create-release.outputs.version }}
293-
release_tag: ${{ needs.create-release.outputs.tag_name }}
292+
firmware_tag: ${{ needs.create-release.outputs.firmware_tag }}
293+
release_tag: ${{ needs.create-release.outputs.release_tag }}
294294
secrets: inherit

.github/workflows/fobe_build_firmware.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
board:
1818
required: true
1919
type: string
20-
version:
20+
firmware_tag:
2121
required: true
2222
type: string
2323
release_tag:
@@ -43,14 +43,14 @@ jobs:
4343
- name: Package binaries
4444
run: |
4545
sudo mv bin ${{ inputs.board }}
46-
tar -cJf ${{ inputs.board }}-${{ inputs.version }}.tar.xz ${{ inputs.board }}
46+
tar -cJf ${{ inputs.board }}-${{ inputs.firmware_tag }}.tar.xz ${{ inputs.board }}
4747
4848
- name: Upload binaries to release
4949
if: ${{ inputs.release_tag != '' }}
5050
uses: softprops/action-gh-release@v2
5151
with:
5252
tag_name: ${{ inputs.release_tag }}
53-
files: ${{ inputs.board }}-${{ inputs.version }}.tar.xz
53+
files: ${{ inputs.board }}-${{ inputs.firmware_tag }}.tar.xz
5454
token: ${{ secrets.GITHUB_TOKEN }}
5555

5656
- name: Store binaries as an artifact
@@ -59,4 +59,4 @@ jobs:
5959
with:
6060
name: firmware-${{ inputs.board }}-${{ github.sha }}.zip
6161
overwrite: true
62-
path: ${{ inputs.board }}-${{ inputs.version }}.tar.xz
62+
path: ${{ inputs.board }}-${{ inputs.firmware_tag }}.tar.xz

0 commit comments

Comments
 (0)