From 42a5053b8497588b3215451cd3c2c649eb399f57 Mon Sep 17 00:00:00 2001
From: Trae Assistant <trae@local.dev>
Date: Mon, 5 Oct 2026 00:55:57 +0800
Subject: [PATCH] =?UTF-8?q?=EF=BB=BFci(deploy):=20=E5=BD=BB=E5=BA=95?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8Drunner=E4=B8=8A=E6=97=A0node=E7=9A=84PATH?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=3DStep0=E7=94=A8find=E5=85=A8=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E6=90=9C=E7=B4=A2node/npm=E7=9C=9F=E5=AE=9E=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95(/usr/local/bin=20/root/.nvm/versions/node/*/bin?=
 =?UTF-8?q?=E7=AD=89)=EF=BC=8C=E6=89=BE=E5=88=B0=E5=90=8E=E5=86=99?=
 =?UTF-8?q?=E5=85=A5=20PATH=EF=BC=8C=E5=90=8E=E7=BB=AD=E6=AD=A5=E9=AA=A4?=
 =?UTF-8?q?=E6=89=80=E6=9C=89node/npm=20100%=E5=8F=AF=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=EF=BC=9BHealth=20check=E5=A4=B1=E8=B4=A5=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0docker=20ps+=E5=AE=B9=E5=99=A8=E6=97=A5?=
 =?UTF-8?q?=E5=BF=9730=E8=A1=8C=E8=AF=8A=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/deploy.yml | 57 ++++++++++++++++++++++++++++---------
 1 file changed, 43 insertions(+), 14 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 731939f..182608a 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -10,20 +10,49 @@ jobs:
     runs-on:
       - ubuntu-latest
       - self-hosted
-    env:
-      PATH: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
     steps:
-      - name: Verify tools (node/npm/git)
+      - name: Locate node/npm and fix PATH
         run: |
-          echo "PATH=$PATH"
-          set -e
-          which git
-          node -v
-          npm -v
-          which curl
-          which ssh || true
-          which ssh-keygen || true
-          ls -la /usr/local/bin/ | grep -E 'node|npm|npx' || true
+          set +e
+          echo "--- initial PATH ---"
+          echo "$PATH"
+          echo
+          echo "--- find node/npm binaries (maxdepth 6, 15s timeout) ---"
+          timeout 15 find / \( -path /proc -o -path /sys \) -prune -o -type f \( -name node -o -name npm \) -print 2>/dev/null | head -n 30 || true
+          echo
+          echo "--- common locations ---"
+          for d in /usr/local/bin /usr/bin /opt/node/bin /root/.nvm/versions/node/*/bin /home/*/.nvm/versions/node/*/bin /snap/bin /opt/homebrew/bin; do
+            [ -x "$d/node" ] && echo "FOUND node in $d: $($d/node -v 2>/dev/null)"
+            [ -x "$d/npm" ]  && echo "FOUND npm  in $d: $($d/npm -v 2>/dev/null)"
+          done
+          echo
+          echo "--- choose first available node/npm dir and write to $GITHUB_ENV ---"
+          NODE_DIR=""
+          for d in /usr/local/bin /usr/bin /opt/node/bin /opt/homebrew/bin /snap/bin; do
+            [ -x "$d/node" ] && [ -x "$d/npm" ] && { NODE_DIR="$d"; break; }
+          done
+          if [ -z "$NODE_DIR" ]; then
+            d=$(dirname "$(find / -path /proc -prune -o -type f -name node -print 2>/dev/null | head -n 1)" 2>/dev/null)
+            [ -n "$d" ] && [ -x "$d/node" ] && [ -x "$d/npm" ] && NODE_DIR="$d"
+          fi
+          if [ -z "$NODE_DIR" ]; then
+            for candidate in /root/.nvm/versions/node/*/bin /home/*/.nvm/versions/node/*/bin; do
+              [ -d "$candidate" ] && [ -x "$candidate/node" ] && [ -x "$candidate/npm" ] && { NODE_DIR="$candidate"; break; }
+            done
+          fi
+          if [ -z "$NODE_DIR" ]; then
+            echo "FAIL: could not locate node/npm on this runner. Install node 20 on the runner host first."
+            exit 1
+          fi
+          echo "SELECTED NODE_DIR=$NODE_DIR"
+          echo "PATH=$NODE_DIR:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$PATH" >> "$GITHUB_ENV"
+          echo
+          echo "--- verify ---"
+          export "PATH=$NODE_DIR:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$PATH"
+          which node && node -v
+          which npm  && npm -v
+          which git  && git --version | head -n 1
+          which curl && which ssh && which scp && (docker --version || docker-compose --version || true)
 
       - name: Prepare workspace
         working-directory: /tmp
@@ -114,7 +143,7 @@ jobs:
           ssh -p $PORT $SSH_USER@$SSH_HOST "mkdir -p /opt/volunteer/app /opt/volunteer/data"
           scp -P $PORT -r deploy-pkg/app/* $SSH_USER@$SSH_HOST:/opt/volunteer/app/
           scp -P $PORT deploy-pkg/docker-compose.yml $SSH_USER@$SSH_HOST:/opt/volunteer/docker-compose.yml
-          ssh -p $PORT $SSH_USER@$SSH_HOST "cd /opt/volunteer && (docker compose down || docker-compose down || true) && (docker compose up -d --force-recreate || docker-compose up -d --force-recreate) && sleep 3 && (docker compose ps || docker-compose ps)"
+          ssh -p $PORT $SSH_USER@$SSH_HOST "cd /opt/volunteer && (docker compose down || docker-compose down || true) && (docker compose up -d --force-recreate || docker-compose up -d --force-recreate) && sleep 5 && (docker compose ps || docker-compose ps)"
 
       - name: Health check
         env:
@@ -123,5 +152,5 @@ jobs:
           SSH_USER: ${{ secrets.SSH_USER }}
         run: |
           PORT="${SSH_PORT:-22}"
-          ssh -p $PORT $SSH_USER@$SSH_HOST "for i in 1 2 3 4 5 6 7 8 9 10; do if curl -fsS http://localhost:3000/u > /dev/null; then echo 'Service OK'; exit 0; fi; echo Wait...; sleep 3; done; echo 'Service FAIL'; exit 1"
+          ssh -p $PORT $SSH_USER@$SSH_HOST "for i in 1 2 3 4 5 6 7 8 9 10 11 12; do if curl -fsS http://localhost:3000/u > /dev/null; then echo 'Service OK'; exit 0; fi; echo Wait...; sleep 3; done; echo '--- Service FAIL, diagnose ---'; (docker compose ps || docker-compose ps); echo '--- container logs last 30 ---'; (docker compose logs --tail 30 || docker-compose logs --tail 30); exit 1"