fix(ci): 改走T_DEPLOY_KEY+直连.86(原secret为空)
deploy-test / build-and-deploy-test (push) Successful in 14m31s

This commit is contained in:
TomyS committed 2026-11-06 18:52:48 +08:00
1 parent 18cf15c43a
commit 53628476d7
1 file changed
+11 -10
+11 -10
View File
@@ -33,16 +33,17 @@ jobs:
- name: Setup SSH key (from secrets)
run: |
mkdir -p ~/.ssh
printf '%s\n' "${{ secrets.CAPTCHA_DEPLOY_KEY }}" > ~/.ssh/id_ed25519_deploy
# T_DEPLOY_KEY=服务器钥匙(2026-11-06 队长注入,可登.86;原CAPTCHA_DEPLOY_KEY远端为空导致run#267 47s挂)
printf '%s\n' "${{ secrets.T_DEPLOY_KEY }}" > ~/.ssh/id_ed25519_deploy
chmod 600 ~/.ssh/id_ed25519_deploy
ssh-keyscan -H ${{ secrets.CAPTCHA_TEST_HOST }} >> ~/.ssh/known_hosts 2>/dev/null
ssh-keyscan -H ${{ secrets.CAPTCHA_PROD_HOST }} >> ~/.ssh/known_hosts 2>/dev/null
ssh-keygen -lf ~/.ssh/id_ed25519_deploy
ssh-keyscan -p 48222 -H 156.233.226.86 >> ~/.ssh/known_hosts 2>/dev/null
echo "SSH 密钥就绪"
- name: Validate required secrets
run: |
test -n "${{ secrets.CAPTCHA_DEPLOY_KEY }}" || { echo "ERROR: CAPTCHA_DEPLOY_KEY为空(run#134曾6s卡死于此)"; exit 1; }
test -n "${{ secrets.CAPTCHA_TEST_HOST }}" || { echo "ERROR: CAPTCHA_TEST_HOST为空"; exit 1; }
test -n "${{ secrets.T_DEPLOY_KEY }}" || { echo "ERROR: CAPTCHA_DEPLOY_KEY为空(run#134曾6s卡死于此)"; exit 1; }
test -n "156.233.226.86" || { echo "ERROR: CAPTCHA_TEST_HOST为空"; exit 1; }
test -n "${{ secrets.CAPTCHA_PROD_HOST }}" || { echo "ERROR: CAPTCHA_PROD_HOST为空"; exit 1; }
echo "Secrets非空校验通过"
@@ -98,7 +99,7 @@ jobs:
- name: Deploy to test env
run: |
set -e
SSH_CMD="ssh -p 48222 -i $HOME/.ssh/id_ed25519_deploy root@${{ secrets.CAPTCHA_TEST_HOST }}"
SSH_CMD="ssh -p 48222 -i $HOME/.ssh/id_ed25519_deploy root@156.233.226.86"
$SSH_CMD '
set -e
echo "===== 拉取镜像 ====="
@@ -116,12 +117,12 @@ jobs:
'
# 上传前端 SDK 构建产物
scp -P 48222 -i $HOME/.ssh/id_ed25519_deploy -r "$GITHUB_WORKSPACE/tac-dist/tac"/* \
root@${{ secrets.CAPTCHA_TEST_HOST }}:/opt/tianai/web/tac/
root@156.233.226.86:/opt/tianai/web/tac/
# 上传管理后台构建产物
mkdir -p /tmp/admin-dist
cp -r "$GITHUB_WORKSPACE/admin-dist/"* /tmp/admin-dist/
scp -P 48222 -i $HOME/.ssh/id_ed25519_deploy -r /tmp/admin-dist/* \
root@${{ secrets.CAPTCHA_TEST_HOST }}:/opt/tianai/web/admin/
root@156.233.226.86:/opt/tianai/web/admin/
# 上传 nginx 配置
cat > /tmp/captcha-nginx.conf <<'NGINX_EOF'
server {
@@ -170,7 +171,7 @@ jobs:
}
NGINX_EOF
scp -P 48222 -i $HOME/.ssh/id_ed25519_deploy /tmp/captcha-nginx.conf \
root@${{ secrets.CAPTCHA_TEST_HOST }}:/opt/tianai/web/nginx.conf
root@156.233.226.86:/opt/tianai/web/nginx.conf
$SSH_CMD '
echo "===== 重建 nginx 容器 ====="
docker rm -f tianai-web 2>/dev/null || true
@@ -190,7 +191,7 @@ jobs:
TEST_SITE_KEY: 6a062b70-c0b3-428e-8f1b-cca402e67ddd
run: |
set -e
SSH_CMD="ssh -p 48222 -i $HOME/.ssh/id_ed25519_deploy root@${{ secrets.CAPTCHA_TEST_HOST }}"
SSH_CMD="ssh -p 48222 -i $HOME/.ssh/id_ed25519_deploy root@156.233.226.86"
OK=0
CODE=000
for i in $(seq 1 24); do