Merge remote-tracking branch 'origin/master'

This commit is contained in:
M_Kececi
2026-02-17 13:13:25 +03:00
parent 4b455814b4
commit 93446e6a69

View File

@@ -18,10 +18,8 @@ build_api_binary() {
fi fi
cd "$APP_DIR/svc" cd "$APP_DIR/svc"
GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags="-w -s" -o "$APP_DIR/bssapp" ./main.go GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags="-w -s" -o "$APP_DIR/svc/bssapp" ./main.go
chmod +x "$APP_DIR/bssapp" chmod +x "$APP_DIR/svc/bssapp"
ln -sf "$APP_DIR/bssapp" "$APP_DIR/nerp"
ln -sf "$APP_DIR/bssapp" "$APP_DIR/start"
} }
run_deploy() { run_deploy() {
@@ -40,7 +38,7 @@ run_deploy() {
echo "== GIT SYNC ==" echo "== GIT SYNC =="
git fetch origin git fetch origin
git reset --hard origin/master 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 ==" echo "== BUILD UI =="
cd "$APP_DIR/ui" cd "$APP_DIR/ui"
@@ -58,6 +56,10 @@ run_deploy() {
return 1 return 1
} }
ln -sf "$SASS_BIN" "$APP_DIR/ui/node_modules/.bin/sass" 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 npm run build