From 3098603ebccea125a094ae5368d4a1e50f37f7be Mon Sep 17 00:00:00 2001
From: vchikalkin <djchikalkin@gmail.com>
Date: Sun, 12 Oct 2025 11:45:19 +0300
Subject: [PATCH] feat: enhance deployment workflow with conditional builds and
 manual triggers

- Updated the deploy.yml to allow conditional builds based on changed paths or manual triggers.
- Introduced a force build step for all services when manually triggered.
- Improved output handling for built services to ensure accurate deployment.
- Added steps for creating environment files and copying them to the VPS, ensuring proper configuration during deployment.
---
 .github/workflows/deploy.yml | 80 +++++++++++++++++-------------------
 1 file changed, 37 insertions(+), 43 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 4b4b04e..e3f86c9 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -14,15 +14,15 @@ jobs:
       web_tag: ${{ steps.vars.outputs.web_tag }}
       bot_tag: ${{ steps.vars.outputs.bot_tag }}
       cache_proxy_tag: ${{ steps.vars.outputs.cache_proxy_tag }}
-      # Добавляем output-ы для отслеживания, какие проекты были собраны
-      web_built: ${{ steps.filter.outputs.web }}
-      bot_built: ${{ steps.filter.outputs.bot }}
-      cache_proxy_built: ${{ steps.filter.outputs.cache_proxy }}
+      web_built: ${{ steps.filter.outputs.web == 'true' || steps.force-build.outputs.web == 'true' }}
+      bot_built: ${{ steps.filter.outputs.bot == 'true' || steps.force-build.outputs.bot == 'true' }}
+      cache_proxy_built: ${{ steps.filter.outputs.cache_proxy == 'true' || steps.force-build.outputs.cache_proxy == 'true' }}
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
 
-      # --- НОВОЕ: Шаг 1: dorny/paths-filter для условной сборки ---
+      # 1️⃣ Проверяем, какие папки изменились
       - name: Filter changed paths
         uses: dorny/paths-filter@v2
         id: filter
@@ -36,7 +36,17 @@ jobs:
               - 'packages/**'
             cache_proxy:
               - 'apps/cache-proxy/**'
-      # -----------------------------------------------------------
+
+      # 2️⃣ При ручном запуске — форсим сборку всех сервисов
+      - name: Force build all on manual trigger
+        id: force-build
+        if: ${{ github.event_name == 'workflow_dispatch' }}
+        run: |
+          echo "web=true" >> $GITHUB_OUTPUT
+          echo "bot=true" >> $GITHUB_OUTPUT
+          echo "cache_proxy=true" >> $GITHUB_OUTPUT
+
+      # 3️⃣ Фейковый .env для сборки
       - name: Create fake .env file for build
         run: |
           echo "BOT_TOKEN=fake" > .env
@@ -52,6 +62,7 @@ jobs:
           echo "PRIVACY_URL=http://localhost:3000/privacy" >> .env
           echo "SUPPORT_TELEGRAM_URL=http://t.me/support" >> .env
 
+      # 4️⃣ Генерируем теги
       - name: Set image tags
         id: vars
         run: |
@@ -59,40 +70,42 @@ jobs:
           echo "bot_tag=bot-${GITHUB_SHA::7}" >> $GITHUB_OUTPUT
           echo "cache_proxy_tag=cache-proxy-${GITHUB_SHA::7}" >> $GITHUB_OUTPUT
 
+      # 5️⃣ Логинимся в Docker Hub
       - name: Login to Docker Hub
         run: echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
 
-      # --- ИЗМЕНЕНО: Условное выполнение Build/Push ---
+      # 6️⃣ Сборка и пуш web
       - name: Build web image
-        if: steps.filter.outputs.web == 'true'
+        if: steps.filter.outputs.web == 'true' || steps.force-build.outputs.web == 'true'
         run: |
           docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/zapishis-web:${{ steps.vars.outputs.web_tag }} -f ./apps/web/Dockerfile .
 
       - name: Push web image to Docker Hub
-        if: steps.filter.outputs.web == 'true'
+        if: steps.filter.outputs.web == 'true' || steps.force-build.outputs.web == 'true'
         run: |
           docker push ${{ secrets.DOCKERHUB_USERNAME }}/zapishis-web:${{ steps.vars.outputs.web_tag }}
 
+      # 7️⃣ Сборка и пуш bot
       - name: Build bot image
-        if: steps.filter.outputs.bot == 'true'
+        if: steps.filter.outputs.bot == 'true' || steps.force-build.outputs.bot == 'true'
         run: |
           docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/zapishis-bot:${{ steps.vars.outputs.bot_tag }} -f ./apps/bot/Dockerfile .
 
       - name: Push bot image to Docker Hub
-        if: steps.filter.outputs.bot == 'true'
+        if: steps.filter.outputs.bot == 'true' || steps.force-build.outputs.bot == 'true'
         run: |
           docker push ${{ secrets.DOCKERHUB_USERNAME }}/zapishis-bot:${{ steps.vars.outputs.bot_tag }}
 
+      # 8️⃣ Сборка и пуш cache-proxy
       - name: Build cache-proxy image
-        if: steps.filter.outputs.cache_proxy == 'true'
+        if: steps.filter.outputs.cache_proxy == 'true' || steps.force-build.outputs.cache_proxy == 'true'
         run: |
           docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/zapishis-cache-proxy:${{ steps.vars.outputs.cache_proxy_tag }} -f ./apps/cache-proxy/Dockerfile .
 
       - name: Push cache-proxy image to Docker Hub
-        if: steps.filter.outputs.cache_proxy == 'true'
+        if: steps.filter.outputs.cache_proxy == 'true' || steps.force-build.outputs.cache_proxy == 'true'
         run: |
           docker push ${{ secrets.DOCKERHUB_USERNAME }}/zapishis-cache-proxy:${{ steps.vars.outputs.cache_proxy_tag }}
-      # -------------------------------------------------
 
   deploy:
     name: Deploy to VPS
@@ -114,10 +127,9 @@ jobs:
         run: |
           ssh -i ~/.ssh/id_rsa -p ${{ secrets.VPS_PORT }} -o StrictHostKeyChecking=no ${{ secrets.VPS_USER }}@${{ secrets.VPS_HOST }} "mkdir -p /home/${{ secrets.VPS_USER }}/zapishis"
 
-      # --- НОВОЕ: Шаг 2: Создание основного .env БЕЗ ТЕГОВ ---
+      # 1️⃣ Основной .env без тегов
       - name: Create real .env file (No Tags)
         run: |
-          # Включаем все секреты, КРОМЕ тегов
           echo "BOT_TOKEN=${{ secrets.BOT_TOKEN }}" > .env
           echo "LOGIN_GRAPHQL=${{ secrets.LOGIN_GRAPHQL }}" >> .env
           echo "PASSWORD_GRAPHQL=${{ secrets.PASSWORD_GRAPHQL }}" >> .env
@@ -132,18 +144,15 @@ jobs:
           echo "OFFER_URL=${{ secrets.OFFER_URL }}" >> .env
           echo "PRIVACY_URL=${{ secrets.PRIVACY_URL }}" >> .env
 
-      # --- НОВОЕ: Шаг 3: Создание файлов тегов (.project.env) ---
+      # 2️⃣ Файлы с тегами
       - name: Create Project Tag Env Files
         run: |
-          # Создаем файлы, которые будут содержать только одну переменную с тегом
           echo "WEB_IMAGE_TAG=${{ needs.build-and-push.outputs.web_tag }}" > .env.web
           echo "BOT_IMAGE_TAG=${{ needs.build-and-push.outputs.bot_tag }}" > .env.bot
           echo "CACHE_PROXY_IMAGE_TAG=${{ needs.build-and-push.outputs.cache_proxy_tag }}" > .env.cache-proxy
 
-      # --- Шаг 4: Копирование .env и УСЛОВНОЕ копирование тегов ---
-
-      # Копируем основной .env всегда
-      - name: Copy .env to VPS via SCP (Always)
+      # 3️⃣ Копирование env-файлов
+      - name: Copy .env to VPS
         uses: appleboy/scp-action@master
         with:
           host: ${{ secrets.VPS_HOST }}
@@ -153,7 +162,6 @@ jobs:
           source: '.env'
           target: '/home/${{ secrets.VPS_USER }}/zapishis/'
 
-      # Копируем .env.web ТОЛЬКО, если web был собран (обновляем тег на VPS)
       - name: Copy .env.web to VPS
         if: ${{ needs.build-and-push.outputs.web_built == 'true' }}
         uses: appleboy/scp-action@master
@@ -165,7 +173,6 @@ jobs:
           source: '.env.web'
           target: '/home/${{ secrets.VPS_USER }}/zapishis/'
 
-      # Копируем .env.bot ТОЛЬКО, если bot был собран
       - name: Copy .env.bot to VPS
         if: ${{ needs.build-and-push.outputs.bot_built == 'true' }}
         uses: appleboy/scp-action@master
@@ -177,7 +184,6 @@ jobs:
           source: '.env.bot'
           target: '/home/${{ secrets.VPS_USER }}/zapishis/'
 
-      # Копируем .env.cache-proxy ТОЛЬКО, если cache-proxy был собран
       - name: Copy .env.cache-proxy to VPS
         if: ${{ needs.build-and-push.outputs.cache_proxy_built == 'true' }}
         uses: appleboy/scp-action@master
@@ -189,7 +195,7 @@ jobs:
           source: '.env.cache-proxy'
           target: '/home/${{ secrets.VPS_USER }}/zapishis/'
 
-      - name: Copy docker-compose.yml to VPS via SCP
+      - name: Copy docker-compose.yml to VPS
         uses: appleboy/scp-action@master
         with:
           host: ${{ secrets.VPS_HOST }}
@@ -199,27 +205,15 @@ jobs:
           source: 'docker-compose.yml'
           target: '/home/${{ secrets.VPS_USER }}/zapishis/'
 
-      # --- ФИНАЛЬНЫЙ ДЕПЛОЙ ---
+      # 4️⃣ Деплой
       - name: Login and deploy on VPS
         run: |
           ssh -i ~/.ssh/id_rsa -p ${{ secrets.VPS_PORT }} -o StrictHostKeyChecking=no ${{ secrets.VPS_USER }}@${{ secrets.VPS_HOST }} "
             cd /home/${{ secrets.VPS_USER }}/zapishis && \
-            
-            # 1. Объединение ВСЕХ ENV-файлов в один основной .env
-            # Теги из .env.web/.env.bot переопределят любые старые/пустые значения, 
-            # и .env станет полным и актуальным.
-            echo \"Merging environment files into .env...\" && \
-            cat .env .env.web .env.bot .env.cache-proxy > .temp_env && \
-            mv .temp_env .env && \
-            
-            # 2. Логин
-            docker login -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_TOKEN }}
-            
-            # 3. Pull ВСЕХ сервисов (Docker Compose автоматически использует обновленный .env)
-            echo \"Pulling all services...\" && \
-            docker compose pull
-            
-            # 4. Перезапуск
+            echo 'Merging env files...' && \
+            cat .env .env.web .env.bot .env.cache-proxy > .temp_env && mv .temp_env .env && \
+            docker login -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_TOKEN }} && \
+            docker compose pull && \
             docker compose down && \
             docker compose up -d
           "