From d66bb4e688ecd7bdcd37197510b003dfec95d776 Mon Sep 17 00:00:00 2001
From: dvirlabs <dvirlabs@gmail.com>
Date: Tue, 17 Jun 2025 04:24:21 +0300
Subject: [PATCH] Fix pipeline and build the backend

---
 .woodpecker.yaml | 26 ++++++++++++++++++--------
 backend/main.py  |  1 -
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/.woodpecker.yaml b/.woodpecker.yaml
index f11c2fa..e8a7c2f 100644
--- a/.woodpecker.yaml
+++ b/.woodpecker.yaml
@@ -57,13 +57,18 @@ steps:
       - apk add --no-cache git yq
       - git config --global user.name "woodpecker-bot"
       - git config --global user.email "ci@dvirlabs.com"
-      - git clone "https://$${GIT_USERNAME}:$${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
+      - git clone "https://${GIT_USERNAME}:${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
       - cd my-apps
       - |
-        TAG=$([[ "$CI_COMMIT_BRANCH" == "develop" ]] && echo "develop-${CI_BUILD_NUMBER}" || echo "${CI_COMMIT_SHA:0:7}")
-        yq -i ".frontend.tag = \"${TAG}\"" manifests/labmap/values.yaml
+        if [ "$CI_COMMIT_BRANCH" = "develop" ]; then
+          TAG="develop-${CI_BUILD_NUMBER}"
+        else
+          TAG="${CI_COMMIT_SHA:0:7}"
+        fi
+        echo "💡 Setting frontend tag to: $TAG"
+        yq -i ".frontend.tag = \"$TAG\"" manifests/labmap/values.yaml
         git add manifests/labmap/values.yaml
-        git commit -m "frontend: update tag to ${TAG}" || echo "No changes"
+        git commit -m "frontend: update tag to $TAG" || echo "No changes"
         git push origin master
 
   update-values-backend:
@@ -82,11 +87,16 @@ steps:
       - apk add --no-cache git yq
       - git config --global user.name "woodpecker-bot"
       - git config --global user.email "ci@dvirlabs.com"
-      - git clone "https://$${GIT_USERNAME}:$${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
+      - git clone "https://${GIT_USERNAME}:${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
       - cd my-apps
       - |
-        TAG=$([[ "$CI_COMMIT_BRANCH" == "develop" ]] && echo "develop-${CI_BUILD_NUMBER}" || echo "${CI_COMMIT_SHA:0:7}")
-        yq -i ".backend.tag = \"${TAG}\"" manifests/labmap/values.yaml
+        if [ "$CI_COMMIT_BRANCH" = "develop" ]; then
+          TAG="develop-${CI_BUILD_NUMBER}"
+        else
+          TAG="${CI_COMMIT_SHA:0:7}"
+        fi
+        echo "💡 Setting backend tag to: $TAG"
+        yq -i ".backend.tag = \"$TAG\"" manifests/labmap/values.yaml
         git add manifests/labmap/values.yaml
-        git commit -m "backend: update tag to ${TAG}" || echo "No changes"
+        git commit -m "backend: update tag to $TAG" || echo "No changes"
         git push origin master
diff --git a/backend/main.py b/backend/main.py
index 0f6b923..21d4717 100644
--- a/backend/main.py
+++ b/backend/main.py
@@ -81,6 +81,5 @@ def list_icons():
     return categories
 
 
-
 if __name__ == "__main__":
     uvicorn.run(app, host="0.0.0.0", port=8000)