From 70b52c27b1829ecf2ee7ea4deea8dde0e1e1b56c Mon Sep 17 00:00:00 2001 From: Roman Meshko Date: Sun, 7 Jun 2026 12:27:36 +0300 Subject: [PATCH] Fixed pipeline --- .woodpecker/02-build-push.yml | 10 +++++++--- .woodpecker/build-push-jetson-trt104.yml | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.woodpecker/02-build-push.yml b/.woodpecker/02-build-push.yml index 29e9834..fc7c761 100644 --- a/.woodpecker/02-build-push.yml +++ b/.woodpecker/02-build-push.yml @@ -37,10 +37,14 @@ steps: commands: - echo "$REGISTRY_TOKEN" | docker login "$REGISTRY_HOST" -u "$REGISTRY_USER" --password-stdin - | - RAW_BRANCH="${CI_COMMIT_BRANCH:-${WOODPECKER_COMMIT_BRANCH:-${CI_COMMIT_REF:-${WOODPECKER_COMMIT_REF:-manual}}}}" + RAW_BRANCH="$CI_COMMIT_BRANCH" + if [ -z "$RAW_BRANCH" ]; then RAW_BRANCH="$WOODPECKER_COMMIT_BRANCH"; fi + if [ -z "$RAW_BRANCH" ]; then RAW_BRANCH="$CI_COMMIT_REF"; fi + if [ -z "$RAW_BRANCH" ]; then RAW_BRANCH="$WOODPECKER_COMMIT_REF"; fi + if [ -z "$RAW_BRANCH" ]; then RAW_BRANCH="manual"; fi SAFE_BRANCH=$(printf '%s' "$RAW_BRANCH" | sed 's#^refs/heads/##; s#^refs/tags/##; s#[^A-Za-z0-9_.-]#-#g; s#^-*##; s#-*$##') - SAFE_BRANCH="${SAFE_BRANCH:-manual}" - TAG="${SAFE_BRANCH}-${TAG_SUFFIX}" + if [ -z "$SAFE_BRANCH" ]; then SAFE_BRANCH="manual"; fi + TAG="$SAFE_BRANCH-$TAG_SUFFIX" BUILD_DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ) echo "RAW_BRANCH=$RAW_BRANCH" echo "SAFE_BRANCH=$SAFE_BRANCH" diff --git a/.woodpecker/build-push-jetson-trt104.yml b/.woodpecker/build-push-jetson-trt104.yml index 9b0ece6..662d77b 100644 --- a/.woodpecker/build-push-jetson-trt104.yml +++ b/.woodpecker/build-push-jetson-trt104.yml @@ -18,10 +18,14 @@ steps: commands: - echo "$REGISTRY_TOKEN" | docker login "$REGISTRY_HOST" -u "$REGISTRY_USER" --password-stdin - | - RAW_BRANCH="${CI_COMMIT_BRANCH:-${WOODPECKER_COMMIT_BRANCH:-${CI_COMMIT_REF:-${WOODPECKER_COMMIT_REF:-manual}}}}" + RAW_BRANCH="$CI_COMMIT_BRANCH" + if [ -z "$RAW_BRANCH" ]; then RAW_BRANCH="$WOODPECKER_COMMIT_BRANCH"; fi + if [ -z "$RAW_BRANCH" ]; then RAW_BRANCH="$CI_COMMIT_REF"; fi + if [ -z "$RAW_BRANCH" ]; then RAW_BRANCH="$WOODPECKER_COMMIT_REF"; fi + if [ -z "$RAW_BRANCH" ]; then RAW_BRANCH="manual"; fi SAFE_BRANCH=$(printf '%s' "$RAW_BRANCH" | sed 's#^refs/heads/##; s#^refs/tags/##; s#[^A-Za-z0-9_.-]#-#g; s#^-*##; s#-*$##') - SAFE_BRANCH="${SAFE_BRANCH:-manual}" - TAG="${SAFE_BRANCH}-arm-trt104" + if [ -z "$SAFE_BRANCH" ]; then SAFE_BRANCH="manual"; fi + TAG="$SAFE_BRANCH-arm-trt104" BUILD_DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ) echo "RAW_BRANCH=$RAW_BRANCH" echo "SAFE_BRANCH=$SAFE_BRANCH"