@@ -18,17 +18,22 @@ jobs:
|
|||||||
|
|
||||||
- name: Execute Bash Deployment
|
- name: Execute Bash Deployment
|
||||||
run: |
|
run: |
|
||||||
|
# 🚨 [新增步骤] 如果环境里没有 rsync,则自动安装它
|
||||||
|
if ! command -v rsync &> /dev/null; then
|
||||||
|
echo "📦 运行环境缺失 rsync,正在尝试自动安装..."
|
||||||
|
sudo apt-get update && sudo apt-get install -y rsync || (apt-get update && apt-get install -y rsync)
|
||||||
|
fi
|
||||||
|
|
||||||
# -------------- 1. 声明与解析变量 --------------
|
# -------------- 1. 声明与解析变量 --------------
|
||||||
SERVER_IP="${{ secrets.SSH_HOST }}"
|
SERVER_IP="${{ secrets.SSH_HOST }}"
|
||||||
SERVER_USER="${{ secrets.SSH_USER }}"
|
SERVER_USER="${{ secrets.SSH_USER }}"
|
||||||
TARGET_DIR="${{ secrets.TARGET_DIR }}"
|
TARGET_DIR="${{ secrets.TARGET_DIR }}"
|
||||||
SSH_PORT="${{ secrets.SSH_PORT }}"
|
SSH_PORT="${{ secrets.SSH_PORT }}"
|
||||||
|
|
||||||
# 兜底本地测试变量(优先读取上面 Secrets,没有则走这里)
|
|
||||||
: ${SERVER_IP:="192.168.31.185"}
|
: ${SERVER_IP:="192.168.31.185"}
|
||||||
: ${SERVER_USER:="root"}
|
: ${SERVER_USER:="root"}
|
||||||
: ${TARGET_DIR:="/data/apps/ci-cd/frontend"}
|
: ${TARGET_DIR:="/data/apps/ci-cd/frontend"}
|
||||||
: ${SSH_PORT:="2222"} # 👈 默认改为了 2222 端口
|
: ${SSH_PORT:="2222"}
|
||||||
|
|
||||||
echo "🌐 准备部署至目标服务器: ${SERVER_USER}@${SERVER_IP}:${TARGET_DIR} (端口: ${SSH_PORT})"
|
echo "🌐 准备部署至目标服务器: ${SERVER_USER}@${SERVER_IP}:${TARGET_DIR} (端口: ${SSH_PORT})"
|
||||||
|
|
||||||
@@ -39,14 +44,11 @@ jobs:
|
|||||||
echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_ed25519
|
echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_ed25519
|
||||||
chmod 600 ~/.ssh/id_ed25519
|
chmod 600 ~/.ssh/id_ed25519
|
||||||
|
|
||||||
# 🚨 关键修改点 1:ssh-keyscan 必须使用 -p 指定非 22 端口
|
|
||||||
echo "🔍 正在扫描目标服务器主机指纹..."
|
echo "🔍 正在扫描目标服务器主机指纹..."
|
||||||
ssh-keyscan -p "$SSH_PORT" -H "$SERVER_IP" >> ~/.ssh/known_hosts 2>/dev/null
|
ssh-keyscan -p "$SSH_PORT" -H "$SERVER_IP" >> ~/.ssh/known_hosts 2>/dev/null
|
||||||
|
|
||||||
# -------------- 3. 执行 rsync 增量同步 --------------
|
# -------------- 3. 执行 rsync 增量同步 --------------
|
||||||
echo "🚀 开始传输增量文件..."
|
echo "🚀 开始传输增量文件..."
|
||||||
|
|
||||||
# 🚨 关键修改点 2:rsync 的 -e "ssh" 内部必须使用 -p 指定端口
|
|
||||||
rsync -avz --delete \
|
rsync -avz --delete \
|
||||||
-e "ssh -i ~/.ssh/id_ed25519 -p $SSH_PORT" \
|
-e "ssh -i ~/.ssh/id_ed25519 -p $SSH_PORT" \
|
||||||
--exclude=".git/" \
|
--exclude=".git/" \
|
||||||
|
|||||||
Reference in New Issue
Block a user