From cc691657a80ac13723d1c2426db78b00d3d3e384 Mon Sep 17 00:00:00 2001
From: Roman Meshko <roman.meshko@gmail.com>
Date: Sun, 7 Jun 2026 11:56:10 +0300
Subject: [PATCH] Fixed pipeline

---
 .woodpecker/02-build-push.yml            | 4 +++-
 .woodpecker/build-push-jetson-trt104.yml | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.woodpecker/02-build-push.yml b/.woodpecker/02-build-push.yml
index 957c1d4..b80490a 100644
--- a/.woodpecker/02-build-push.yml
+++ b/.woodpecker/02-build-push.yml
@@ -36,7 +36,9 @@ steps:
         from_secret: registry_token
     commands:
       - echo "$REGISTRY_TOKEN" | docker login "$REGISTRY_HOST" -u "$REGISTRY_USER" --password-stdin
-      - export SAFE_BRANCH=$(printf '%s' "$CI_COMMIT_BRANCH" | sed 's#[^A-Za-z0-9_.-]#-#g')
+      - export RAW_BRANCH="${CI_COMMIT_BRANCH:-${WOODPECKER_COMMIT_BRANCH:-${CI_COMMIT_REF:-${WOODPECKER_COMMIT_REF:-manual}}}}"
+      - export SAFE_BRANCH=$(printf '%s' "$RAW_BRANCH" | sed 's#^refs/heads/##; s#^refs/tags/##; s#[^A-Za-z0-9_.-]#-#g; s#^-*##; s#-*$##')
+      - export SAFE_BRANCH="${SAFE_BRANCH:-manual}"
       - export TAG=${SAFE_BRANCH}-${TAG_SUFFIX}
       - export BUILD_DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ)
       - |
diff --git a/.woodpecker/build-push-jetson-trt104.yml b/.woodpecker/build-push-jetson-trt104.yml
index 75ab0c8..c1a23f1 100644
--- a/.woodpecker/build-push-jetson-trt104.yml
+++ b/.woodpecker/build-push-jetson-trt104.yml
@@ -17,7 +17,9 @@ steps:
         from_secret: registry_token
     commands:
       - echo "$REGISTRY_TOKEN" | docker login "$REGISTRY_HOST" -u "$REGISTRY_USER" --password-stdin
-      - export SAFE_BRANCH=$(printf '%s' "$CI_COMMIT_BRANCH" | sed 's#[^A-Za-z0-9_.-]#-#g')
+      - export RAW_BRANCH="${CI_COMMIT_BRANCH:-${WOODPECKER_COMMIT_BRANCH:-${CI_COMMIT_REF:-${WOODPECKER_COMMIT_REF:-manual}}}}"
+      - export SAFE_BRANCH=$(printf '%s' "$RAW_BRANCH" | sed 's#^refs/heads/##; s#^refs/tags/##; s#[^A-Za-z0-9_.-]#-#g; s#^-*##; s#-*$##')
+      - export SAFE_BRANCH="${SAFE_BRANCH:-manual}"
       - export TAG=${SAFE_BRANCH}-arm-trt104
       - export BUILD_DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ)
       - |