From 5d1842b7e5cd7bb788c63c8950668d9aa13f5f6d Mon Sep 17 00:00:00 2001
From: Developer <developer@discord-automod.local>
Date: Mon, 27 Jul 2026 22:01:05 +0700
Subject: [PATCH] fix: merge deploy step into build-and-push job to avoid
 runner mismatch

The separate 'deploy' job with runs-on: ubuntu-latest never
found an available runner, blocking the pipeline. By moving
the deploy steps into the build-and-push job (guarded by
matrix.service == 'proxy'), it runs on the same runner that
just pushed the images, eliminating the runner assignment issue.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .gitea/workflows/deploy.yml | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 22ce3ff..4fd5793 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -47,25 +47,21 @@ jobs:
           docker push $IMG:${{ github.sha }}
           docker push $IMG:latest
 
-  deploy:
-    needs: build-and-push
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/main'
-    steps:
-      - name: Install SSH
-        run: |
-          apt-get update -qq
-          apt-get install -y -qq --no-install-recommends openssh-client ca-certificates
-      - name: Deploy
+      - name: Deploy (proxy only — after all pushes)
+        if: matrix.service == 'proxy' && github.ref == 'refs/heads/main'
         env:
           ENV_FILE: ${{ secrets.ENV_FILE }}
           SSH_KEY: ${{ secrets.VPS_SSH_KEY }}
+          VPS_USER: ${{ secrets.VPS_USER }}
+          VPS_HOST: ${{ secrets.VPS_HOST }}
         run: |
           set -eu
+          apt-get update -qq
+          apt-get install -y -qq --no-install-recommends openssh-client ca-certificates
           mkdir -p ~/.ssh
           echo "$SSH_KEY" > ~/.ssh/id_ed25519
           chmod 600 ~/.ssh/id_ed25519
           ENV_B64=$(echo "$ENV_FILE" | base64 -w0)
           ssh -o StrictHostKeyChecking=accept-new \
-            ${{ secrets.VPS_USER }}@${{ secrets.VPS_HOST }} \
+            "$VPS_USER@$VPS_HOST" \
             "cd /opt/imphenbot/infra/docker && echo '$ENV_B64' | base64 -d > .env && docker compose pull && docker compose up -d --remove-orphans && docker image prune -f"