Mirrors/MeshCore-Solo
1
0
Fork 0
mirror of https://github.com/MarekZegare4/MeshCore-Solo.git synced 2026-07-26 14:58:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: correct UF2 artifact name for wio-tracker tags with hyphenated versions

Browse Source 
##*- strips to the last hyphen, so wio-tracker-v1.15-plus.1.3 yielded
"plus.1.3" instead of "v1.15-plus.1.3". Switch to #*-v (shortest prefix
ending with -v) which preserves hyphens inside the version string.

Also remove the -Plus suffix appended in build_wio_tracker_l1_firmwares()
since the version scheme already encodes "plus" in the tag/version string,
making the suffix redundant and producing doubled output like "plus.1.3-Plus".

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Jakub
2026-05-15 15:24:54 +02:00
parent bf05a13549
commit a819b05ed0
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/actions/setup-build-environment/action.yml vendored
View File

@@ -22,8 +22,10 @@ runs:
pip install --upgrade platformio pip install --upgrade platformio
# a git tag of "room-server-v1.2.3" should set "v1.2.3" as GIT_TAG_VERSION # a git tag of "room-server-v1.2.3" should set "v1.2.3" as GIT_TAG_VERSION
# a git tag of "wio-tracker-v1.15-plus.1.3" should set "v1.15-plus.1.3" as GIT_TAG_VERSION
# Strip the shortest prefix ending with "-v" so hyphens in the version are preserved.
- name: Extract Version from Git Tag - name: Extract Version from Git Tag
shell: bash shell: bash
run: | run: |
GIT_TAG_NAME="${GITHUB_REF#refs/tags/}" GIT_TAG_NAME="${GITHUB_REF#refs/tags/}"
echo "GIT_TAG_VERSION=${GIT_TAG_NAME##*-}" >> $GITHUB_ENV echo "GIT_TAG_VERSION=v${GIT_TAG_NAME#*-v}" >> $GITHUB_ENV

3
build.sh
View File

@@ -231,11 +231,8 @@ build_companion_firmwares() {
} }
build_wio_tracker_l1_firmwares() { build_wio_tracker_l1_firmwares() {
local _saved_version="$FIRMWARE_VERSION"
export FIRMWARE_VERSION="${FIRMWARE_VERSION}-Plus"
build_firmware "WioTrackerL1_companion_radio_usb_settings" build_firmware "WioTrackerL1_companion_radio_usb_settings"
build_firmware "WioTrackerL1_companion_radio_ble_settings" build_firmware "WioTrackerL1_companion_radio_ble_settings"
export FIRMWARE_VERSION="$_saved_version"
} }
build_room_server_firmwares() { build_room_server_firmwares() {