From 93446e6a69da30ee9bcc9299f6736d5c678abf40 Mon Sep 17 00:00:00 2001 From: M_Kececi Date: Tue, 17 Feb 2026 13:13:25 +0300 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- deploy/deploy.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/deploy/deploy.sh b/deploy/deploy.sh index 3d31523..21e019e 100644 --- a/deploy/deploy.sh +++ b/deploy/deploy.sh @@ -18,10 +18,8 @@ build_api_binary() { fi cd "$APP_DIR/svc" - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags="-w -s" -o "$APP_DIR/bssapp" ./main.go - chmod +x "$APP_DIR/bssapp" - ln -sf "$APP_DIR/bssapp" "$APP_DIR/nerp" - ln -sf "$APP_DIR/bssapp" "$APP_DIR/start" + GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags="-w -s" -o "$APP_DIR/svc/bssapp" ./main.go + chmod +x "$APP_DIR/svc/bssapp" } run_deploy() { @@ -40,7 +38,7 @@ run_deploy() { echo "== GIT SYNC ==" git fetch origin git reset --hard origin/master - git clean -fdx -e bssapp -e nerp + git clean -fdx -e .env -e mail.env -e svc/.env -e svc/mail.env -e svc/bssapp echo "== BUILD UI ==" cd "$APP_DIR/ui" @@ -58,6 +56,10 @@ run_deploy() { return 1 } ln -sf "$SASS_BIN" "$APP_DIR/ui/node_modules/.bin/sass" + "$APP_DIR/ui/node_modules/.bin/sass" --embedded --version >/dev/null 2>&1 || { + echo "node_modules/.bin/sass still does not support --embedded." + return 1 + } npm run build