Fixed pipeline

This commit is contained in:
Roman Meshko
2026-06-07 12:27:36 +03:00
parent 5be8e05d9c
commit 70b52c27b1
2 changed files with 14 additions and 6 deletions
+7 -3
View File
@@ -37,10 +37,14 @@ steps:
commands: commands:
- echo "$REGISTRY_TOKEN" | docker login "$REGISTRY_HOST" -u "$REGISTRY_USER" --password-stdin - 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=$(printf '%s' "$RAW_BRANCH" | sed 's#^refs/heads/##; s#^refs/tags/##; s#[^A-Za-z0-9_.-]#-#g; s#^-*##; s#-*$##')
SAFE_BRANCH="${SAFE_BRANCH:-manual}" if [ -z "$SAFE_BRANCH" ]; then SAFE_BRANCH="manual"; fi
TAG="${SAFE_BRANCH}-${TAG_SUFFIX}" TAG="$SAFE_BRANCH-$TAG_SUFFIX"
BUILD_DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ) BUILD_DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ)
echo "RAW_BRANCH=$RAW_BRANCH" echo "RAW_BRANCH=$RAW_BRANCH"
echo "SAFE_BRANCH=$SAFE_BRANCH" echo "SAFE_BRANCH=$SAFE_BRANCH"
+7 -3
View File
@@ -18,10 +18,14 @@ steps:
commands: commands:
- echo "$REGISTRY_TOKEN" | docker login "$REGISTRY_HOST" -u "$REGISTRY_USER" --password-stdin - 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=$(printf '%s' "$RAW_BRANCH" | sed 's#^refs/heads/##; s#^refs/tags/##; s#[^A-Za-z0-9_.-]#-#g; s#^-*##; s#-*$##')
SAFE_BRANCH="${SAFE_BRANCH:-manual}" if [ -z "$SAFE_BRANCH" ]; then SAFE_BRANCH="manual"; fi
TAG="${SAFE_BRANCH}-arm-trt104" TAG="$SAFE_BRANCH-arm-trt104"
BUILD_DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ) BUILD_DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ)
echo "RAW_BRANCH=$RAW_BRANCH" echo "RAW_BRANCH=$RAW_BRANCH"
echo "SAFE_BRANCH=$SAFE_BRANCH" echo "SAFE_BRANCH=$SAFE_BRANCH"