From a819b05ed0d7106509959008f96a62a3ecb3ff91 Mon Sep 17 00:00:00 2001
From: Jakub <106778416+MarekZegare4@users.noreply.github.com>
Date: Fri, 15 May 2026 15:24:54 +0200
Subject: [PATCH] fix: correct UF2 artifact name for wio-tracker tags with
 hyphenated versions

##*- 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>
---
 .github/actions/setup-build-environment/action.yml | 4 +++-
 build.sh                                           | 3 ---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/actions/setup-build-environment/action.yml b/.github/actions/setup-build-environment/action.yml
index 2ba7617e..7703c1ef 100644
--- a/.github/actions/setup-build-environment/action.yml
+++ b/.github/actions/setup-build-environment/action.yml
@@ -22,8 +22,10 @@ runs:
         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 "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
       shell: bash
       run: |
         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
diff --git a/build.sh b/build.sh
index 8fc513d2..6e2e8cfb 100755
--- a/build.sh
+++ b/build.sh
@@ -231,11 +231,8 @@ build_companion_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_ble_settings"
-  export FIRMWARE_VERSION="$_saved_version"
 }
 
 build_room_server_firmwares() {