From 36f48331b41d4374413ed5a72de4765c106bf5c0 Mon Sep 17 00:00:00 2001
From: Stephan D <sdeshevikh@yandex.ru>
Date: Fri, 7 Nov 2025 20:18:16 +0100
Subject: [PATCH] build fix

---
 .woodpecker/fx_ingestor.yml | 23 +++++++++++++++++++++++
 .woodpecker/fx_oracle.yml   | 23 +++++++++++++++++++++++
 api/fx/storage/go.mod       |  2 +-
 api/fx/storage/go.sum       |  2 ++
 4 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/.woodpecker/fx_ingestor.yml b/.woodpecker/fx_ingestor.yml
index 90de9c2..f24b48a 100644
--- a/.woodpecker/fx_ingestor.yml
+++ b/.woodpecker/fx_ingestor.yml
@@ -39,6 +39,29 @@ steps:
     depends_on: [ secrets ]
     commands:
       - set -euo pipefail 2>/dev/null || set -eu
+      - |
+        if [ ! -s ./.env.version ] || ! grep -q '=' ./.env.version 2>/dev/null; then
+          echo "[build-image] .env.version missing or malformed, regenerating defaults" >&2
+          if [ -n "${WOODPECKER_COMMIT:-}" ]; then
+            GIT_REV="$(printf '%s' "${WOODPECKER_COMMIT}" | cut -c1-7)"
+          elif command -v git >/dev/null 2>&1; then
+            GIT_REV="$(git rev-parse --short HEAD 2>/dev/null || echo dev)"
+          else
+            GIT_REV="dev"
+          fi
+          if [ -n "${WOODPECKER_BRANCH:-}" ]; then
+            BUILD_BRANCH="${WOODPECKER_BRANCH}"
+          elif command -v git >/dev/null 2>&1; then
+            BUILD_BRANCH="$(git rev-parse --abbrev-ref HEAD 2>/dev/null || echo local)"
+          else
+            BUILD_BRANCH="local"
+          fi
+          APP_V="$(cat version 2>/dev/null || echo dev)"
+          BUILD_DATE="$(date -u +%Y-%m-%dT%H:%M:%SZ 2>/dev/null || echo unknown)"
+          BUILD_USER="${WOODPECKER_MACHINE:-woodpecker}"
+          printf "GIT_REV=%s\nBUILD_BRANCH=%s\nAPP_V=%s\nBUILD_DATE=%s\nBUILD_USER=%s\n" \
+            "$GIT_REV" "$BUILD_BRANCH" "$APP_V" "$BUILD_DATE" "$BUILD_USER" > .env.version
+        fi
       - sed -i 's/\r$//' ./ci/prod/.env.runtime
       - sed -i 's/\r$//' ./.env.version
       - set -a
diff --git a/.woodpecker/fx_oracle.yml b/.woodpecker/fx_oracle.yml
index 1d6d742..136346b 100644
--- a/.woodpecker/fx_oracle.yml
+++ b/.woodpecker/fx_oracle.yml
@@ -39,6 +39,29 @@ steps:
     depends_on: [ secrets ]
     commands:
       - set -euo pipefail 2>/dev/null || set -eu
+      - |
+        if [ ! -s ./.env.version ] || ! grep -q '=' ./.env.version 2>/dev/null; then
+          echo "[build-image] .env.version missing or malformed, regenerating defaults" >&2
+          if [ -n "${WOODPECKER_COMMIT:-}" ]; then
+            GIT_REV="$(printf '%s' "${WOODPECKER_COMMIT}" | cut -c1-7)"
+          elif command -v git >/dev/null 2>&1; then
+            GIT_REV="$(git rev-parse --short HEAD 2>/dev/null || echo dev)"
+          else
+            GIT_REV="dev"
+          fi
+          if [ -n "${WOODPECKER_BRANCH:-}" ]; then
+            BUILD_BRANCH="${WOODPECKER_BRANCH}"
+          elif command -v git >/dev/null 2>&1; then
+            BUILD_BRANCH="$(git rev-parse --abbrev-ref HEAD 2>/dev/null || echo local)"
+          else
+            BUILD_BRANCH="local"
+          fi
+          APP_V="$(cat version 2>/dev/null || echo dev)"
+          BUILD_DATE="$(date -u +%Y-%m-%dT%H:%M:%SZ 2>/dev/null || echo unknown)"
+          BUILD_USER="${WOODPECKER_MACHINE:-woodpecker}"
+          printf "GIT_REV=%s\nBUILD_BRANCH=%s\nAPP_V=%s\nBUILD_DATE=%s\nBUILD_USER=%s\n" \
+            "$GIT_REV" "$BUILD_BRANCH" "$APP_V" "$BUILD_DATE" "$BUILD_USER" > .env.version
+        fi
       - sed -i 's/\r$//' ./ci/prod/.env.runtime
       - sed -i 's/\r$//' ./.env.version
       - set -a
diff --git a/api/fx/storage/go.mod b/api/fx/storage/go.mod
index 38dddfe..9b49e17 100644
--- a/api/fx/storage/go.mod
+++ b/api/fx/storage/go.mod
@@ -12,7 +12,7 @@ require (
 
 require (
 	github.com/bmatcuk/doublestar/v4 v4.9.1 // indirect
-	github.com/casbin/casbin/v2 v2.128.0 // indirect
+	github.com/casbin/casbin/v2 v2.132.0 // indirect
 	github.com/casbin/govaluate v1.10.0 // indirect
 	github.com/casbin/mongodb-adapter/v3 v3.7.0 // indirect
 	github.com/golang/snappy v1.0.0 // indirect
diff --git a/api/fx/storage/go.sum b/api/fx/storage/go.sum
index da414fc..0ddb9ed 100644
--- a/api/fx/storage/go.sum
+++ b/api/fx/storage/go.sum
@@ -9,6 +9,8 @@ github.com/bmatcuk/doublestar/v4 v4.9.1 h1:X8jg9rRZmJd4yRy7ZeNDRnM+T3ZfHv15JiBJ/
 github.com/bmatcuk/doublestar/v4 v4.9.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
 github.com/casbin/casbin/v2 v2.128.0 h1:761dLmXLy/ZNSckAITvpUZ8VdrxARyIlwmdafHzRb7Y=
 github.com/casbin/casbin/v2 v2.128.0/go.mod h1:iAwqzcYzJtAK5QWGT2uRl9WfRxXyKFBG1AZuhk2NAQg=
+github.com/casbin/casbin/v2 v2.132.0 h1:73hGmOszGSL3hTVquwkAi98XLl3gPJ+BxB6D7G9Fxtk=
+github.com/casbin/casbin/v2 v2.132.0/go.mod h1:FmcfntdXLTcYXv/hxgNntcRPqAbwOG9xsism0yXT+18=
 github.com/casbin/govaluate v1.3.0/go.mod h1:G/UnbIjZk/0uMNaLwZZmFQrR72tYRZWQkO70si/iR7A=
 github.com/casbin/govaluate v1.10.0 h1:ffGw51/hYH3w3rZcxO/KcaUIDOLP84w7nsidMVgaDG0=
 github.com/casbin/govaluate v1.10.0/go.mod h1:G/UnbIjZk/0uMNaLwZZmFQrR72tYRZWQkO70si/iR7A=