diff --git a/.gitea/workflows/deploy-frontend.yml b/.gitea/workflows/deploy-frontend.yml
index c2f9e69..f912f42 100644
--- a/.gitea/workflows/deploy-frontend.yml
+++ b/.gitea/workflows/deploy-frontend.yml
@@ -1,4 +1,4 @@
-name: Deploy Manager Frontend
+name: Deploy Manager App
on:
push:
@@ -6,15 +6,20 @@ on:
env:
REPO_DIR: "/workspace/manager_orders_app"
- REPO_URL: "https://72.56.235.246.nip.io/gitea/romanskijdev/manager_orders_app.git" # Укажите точную ссылку на ваш репозиторий в Gitea
+ REPO_URL: "https://${{ github.actor }}:${{ github.token }}@72.56.235.246.nip.io/gitea/romanskijdev/manager_orders_app.git"
BUILD_DIR: "/var/www/znzt.ruspet.tw1.ru"
+ BACKUP_DIR: "/tmp/deploy_backups_manager"
+ APP_SERVICE_NAME: "Manager App"
jobs:
- build-and-deploy:
- runs-on: ubuntu-latest
- timeout-minutes: 15
+ deploy:
+ runs-on: self-hosted
+ timeout-minutes: 5
steps:
+ # ═══════════════════════════════════════════════════════════════
+ # ШАГ 1: Информация о деплое
+ # ═══════════════════════════════════════════════════════════════
- name: 📋 Deployment Info
run: |
echo "════════════════════════════════════════"
@@ -23,46 +28,96 @@ jobs:
echo "Branch: ${{ github.ref }}"
echo "Commit: ${{ github.sha }}"
echo "Author: ${{ github.actor }}"
+ echo "Message: ${{ github.event.head_commit.message }}"
echo "Time: $(date '+%Y-%m-%d %H:%M:%S')"
echo "Runner: $(hostname)"
+ echo "User: $(whoami)"
echo "════════════════════════════════════════"
- - name: 📦 Checkout
+ # ═══════════════════════════════════════════════════════════════
+ # ШАГ 2: Checkout & Analyze Changes
+ # ═══════════════════════════════════════════════════════════════
+ - name: 📦 Checkout & Analyze Changes
+ id: checkout
run: |
+ mkdir -p "$BACKUP_DIR"
git config --global --add safe.directory "$REPO_DIR"
+
+ DEPLOY_APP=false
+
if [ -d "$REPO_DIR/.git" ]; then
echo "📦 Updating existing repo..."
cd "$REPO_DIR"
+ git remote set-url origin "$REPO_URL"
+
+ OLD_COMMIT=$(git rev-parse HEAD)
+ echo "Previous commit: $OLD_COMMIT"
git fetch origin
+
+ CHANGED_FILES=$(git diff --name-only $OLD_COMMIT origin/main 2>/dev/null || echo "")
+
+ if [ -z "$CHANGED_FILES" ]; then
+ echo "⚠️ No changes detected, deploying app..."
+ DEPLOY_APP=true
+ else
+ echo "📝 Changed files:"
+ echo "$CHANGED_FILES" | sed 's/^/ /'
+ echo ""
+ # Для фронтенда любые изменения в коде триггерят деплой
+ DEPLOY_APP=true
+ fi
+
git reset --hard origin/main
+ NEW_COMMIT=$(git rev-parse HEAD)
+ echo "New commit: $NEW_COMMIT"
else
echo "📦 Cloning repo..."
- git clone "$REPO_URL" "$REPO_DIR"
+ git clone -b main "$REPO_URL" "$REPO_DIR"
+ DEPLOY_APP=true
fi
+
+ echo "DEPLOY_APP=$DEPLOY_APP" >> $GITHUB_ENV
- - name: 💾 Cache node_modules
- uses: actions/cache@v3
- with:
- path: |
- ~/.npm
- $REPO_DIR/node_modules
- key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
- restore-keys: |
- ${{ runner.os }}-node-
+ # ═══════════════════════════════════════════════════════════════
+ # ШАГ 3: Создание бэкапа предыдущей версии сайта (для отката)
+ # ═══════════════════════════════════════════════════════════════
+ - name: 💾 Create Backup
+ if: env.DEPLOY_APP == 'true'
+ run: |
+ BACKUP_TIMESTAMP=$(date +%Y%m%d_%H%M%S)
+ echo "BACKUP_TIMESTAMP=$BACKUP_TIMESTAMP" >> $GITHUB_ENV
+
+ if [ -d "$BUILD_DIR" ] && [ "$(ls -A $BUILD_DIR)" ]; then
+ BACKUP_FILE="$BACKUP_DIR/manager_app_${BACKUP_TIMESTAMP}.tar.gz"
+ tar -czf "$BACKUP_FILE" -C "$BUILD_DIR" .
+ echo "💾 Backup created: $BACKUP_FILE"
+ echo "APP_BACKUP=$BACKUP_FILE" >> $GITHUB_ENV
+ else
+ echo "⚠️ Build directory is empty (first deploy?)"
+ fi
+
+ echo "🧹 Cleaning old backups..."
+ ls -t "$BACKUP_DIR"/* 2>/dev/null | tail -n +11 | xargs -r rm -- || true
- - name: 📥 Install dependencies
+ # ═══════════════════════════════════════════════════════════════
+ # ШАГ 4: Сборка проекта (Build)
+ # ═══════════════════════════════════════════════════════════════
+ - name: 🔨 Install & Build
+ if: env.DEPLOY_APP == 'true'
run: |
cd "$REPO_DIR"
+ echo "📥 Installing dependencies..."
npm ci
-
- - name: 🔨 Build
- run: |
- cd "$REPO_DIR"
+ echo "🔨 Building Vite application..."
npm run build
echo "✅ Build completed"
ls -la dist/
- - name: 📤 Deploy to web server
+ # ═══════════════════════════════════════════════════════════════
+ # ШАГ 5: Деплой на веб-сервер (Nginx)
+ # ═══════════════════════════════════════════════════════════════
+ - name: 📤 Deploy to Web Server
+ if: env.DEPLOY_APP == 'true'
run: |
echo "📤 Deploying to $BUILD_DIR..."
sudo mkdir -p "$BUILD_DIR"
@@ -72,33 +127,84 @@ jobs:
sudo chmod -R 755 "$BUILD_DIR"
echo "✅ Frontend deployed successfully"
- - name: ✅ Verify deployment
+ # ═══════════════════════════════════════════════════════════════
+ # ШАГ 6: Rollback при ошибке
+ # ═══════════════════════════════════════════════════════════════
+ - name: ⏮️ Rollback on Failure
+ if: failure()
+ run: |
+ echo "════════════════════════════════════════"
+ echo "⏮️ Starting rollback..."
+ echo "════════════════════════════════════════"
+
+ if [ -n "${APP_BACKUP}" ] && [ -f "${APP_BACKUP}" ]; then
+ echo "⏮️ Restoring files from backup: ${APP_BACKUP}"
+ sudo rm -rf "$BUILD_DIR"/*
+ sudo tar -xzf "${APP_BACKUP}" -C "$BUILD_DIR"
+ sudo chown -R www-data:www-data "$BUILD_DIR"
+ sudo chmod -R 755 "$BUILD_DIR"
+ echo "✅ Rollback completed successfully"
+ else
+ echo "⚠️ No backup available to restore"
+ fi
+
+ # ═══════════════════════════════════════════════════════════════
+ # ШАГ 7: Финальная верификация
+ # ═══════════════════════════════════════════════════════════════
+ - name: ✅ Verify Deployment
+ if: success()
run: |
echo "🔍 Verifying deployment..."
if [ -f "$BUILD_DIR/index.html" ]; then
echo "✅ index.html exists"
ls -lh "$BUILD_DIR/index.html"
- echo "✅ Deployment verified successfully"
else
echo "❌ index.html not found"
exit 1
fi
+ # ═══════════════════════════════════════════════════════════════
+ # ШАГ 8: Уведомление об успехе в Telegram
+ # ═══════════════════════════════════════════════════════════════
+ - name: 📢 Notify Success
+ if: success()
+ run: |
+ if [ -n "${{ secrets.TELEGRAM_BOT_TOKEN }}" ] && [ -n "${{ secrets.TELEGRAM_CHAT_ID }}" ]; then
+ MESSAGE="✅ Manager App Deployment successful%0A%0A"
+ MESSAGE+="🌿 Branch: ${{ github.ref_name }}%0A"
+ MESSAGE+="📝 Commit: ${{ github.sha }}%0A"
+ MESSAGE+="👤 Author: ${{ github.actor }}%0A"
+ MESSAGE+="🌐 URL: https://znzt.ruspet.tw1.ru%0A%0A"
+ MESSAGE+="⏰ $(date '+%Y-%m-%d %H:%M:%S')"
+
+ curl -s -X POST "https://api.telegram.org/bot${{ secrets.TELEGRAM_BOT_TOKEN }}/sendMessage" \
+ -d "chat_id=${{ secrets.TELEGRAM_CHAT_ID }}" -d "parse_mode=HTML" -d "text=$MESSAGE"
+ fi
+
+ # ═══════════════════════════════════════════════════════════════
+ # ШАГ 9: Уведомление об ошибке в Telegram
+ # ═══════════════════════════════════════════════════════════════
+ - name: 🚨 Notify Failure
+ if: failure()
+ run: |
+ if [ -n "${{ secrets.TELEGRAM_BOT_TOKEN }}" ] && [ -n "${{ secrets.TELEGRAM_CHAT_ID }}" ]; then
+ MESSAGE="❌ Manager App Deployment failed%0A%0A"
+ MESSAGE+="🌿 Branch: ${{ github.ref_name }}%0A"
+ MESSAGE+="⏮️ Rollback executed (previous version restored)%0A"
+
+ curl -s -X POST "https://api.telegram.org/bot${{ secrets.TELEGRAM_BOT_TOKEN }}/sendMessage" \
+ -d "chat_id=${{ secrets.TELEGRAM_CHAT_ID }}" -d "parse_mode=HTML" -d "text=$MESSAGE"
+ fi
+
+ # ═══════════════════════════════════════════════════════════════
+ # ШАГ 10: Итоговая сводка
+ # ═══════════════════════════════════════════════════════════════
- name: 📊 Deployment Summary
if: always()
run: |
echo "════════════════════════════════════════"
echo "📊 DEPLOYMENT SUMMARY"
echo "════════════════════════════════════════"
- echo "Status: ${{ job.status }}"
- echo "Branch: ${{ github.ref }}"
- echo "Commit: ${{ github.sha }}"
- echo "Duration: $SECONDS seconds"
- echo "════════════════════════════════════════"
-
- if [ "${{ job.status }}" == "success" ]; then
- echo "✅ Manager app deployment completed!"
- echo "🌐 Available at: https://znzt.ruspet.tw1.ru"
- else
- echo "❌ Manager app deployment failed!"
- fi
\ No newline at end of file
+ echo "Status: ${{ job.status }}"
+ echo "Domain: https://znzt.ruspet.tw1.ru"
+ echo "════════════════════════════════════════"
\ No newline at end of file