feat: 优化部署工作流,使用新Action简化上传和解压流程
- 在`deploy-admin.yml`中,使用`appleboy/scp-action`和`appleboy/ssh-action`替代sshpass,简化文件上传和解压步骤 - 在`deploy-frontend.yml`中,更新文件上传和权限设置步骤,提升部署效率 - 增强了健康检查脚本的可读性和一致性 此更改提升了部署的效率和可靠性。
This commit is contained in:
@ -137,38 +137,59 @@ jobs:
|
|||||||
echo '✅ 管理后台部署完成!'
|
echo '✅ 管理后台部署完成!'
|
||||||
"
|
"
|
||||||
|
|
||||||
- name: 📤 上传构建产物
|
- name: 📤 上传构建产物到服务器
|
||||||
run: |
|
uses: appleboy/scp-action@v0.1.6
|
||||||
export SSHPASS=${{ secrets.ALIYUN_PWD }}
|
with:
|
||||||
|
host: ${{ secrets.ALIYUN_IP }}
|
||||||
|
username: ${{ secrets.ALIYUN_USER_NAME }}
|
||||||
|
key: ${{ secrets.ALIYUN_SSH_KEY }}
|
||||||
|
port: 22
|
||||||
|
source: "admin/admin-dist.tar.gz"
|
||||||
|
target: "/tmp/"
|
||||||
|
|
||||||
# 上传文件到服务器
|
- name: 🚀 解压并部署文件
|
||||||
sshpass -e scp -o StrictHostKeyChecking=no -o ConnectTimeout=10 admin/admin-dist.tar.gz ${{ secrets.ALIYUN_USER_NAME }}@${{ secrets.ALIYUN_IP }}:/tmp/
|
uses: appleboy/ssh-action@v1.0.0
|
||||||
|
with:
|
||||||
|
host: ${{ secrets.ALIYUN_IP }}
|
||||||
|
username: ${{ secrets.ALIYUN_USER_NAME }}
|
||||||
|
key: ${{ secrets.ALIYUN_SSH_KEY }}
|
||||||
|
port: 22
|
||||||
|
script: |
|
||||||
|
echo "🚀 开始部署管理后台..."
|
||||||
|
|
||||||
# 解压并部署
|
ADMIN_DIR="/home/gitea/www/photography-admin"
|
||||||
sshpass -e ssh -o StrictHostKeyChecking=no -o ConnectTimeout=10 ${{ secrets.ALIYUN_USER_NAME }}@${{ secrets.ALIYUN_IP }} "
|
|
||||||
set -e
|
|
||||||
ADMIN_DIR='/home/gitea/www/photography-admin'
|
|
||||||
|
|
||||||
echo '📦 正在解压文件...'
|
# 确保目录存在
|
||||||
|
mkdir -p $ADMIN_DIR
|
||||||
|
|
||||||
|
# 解压文件
|
||||||
|
echo "📦 正在解压文件..."
|
||||||
mkdir -p /tmp/admin-deploy
|
mkdir -p /tmp/admin-deploy
|
||||||
tar -xzf /tmp/admin-dist.tar.gz -C /tmp/admin-deploy/
|
tar -xzf /tmp/admin-dist.tar.gz -C /tmp/admin-deploy/
|
||||||
|
|
||||||
echo '🚀 正在部署文件...'
|
# 清空旧文件并部署新文件
|
||||||
|
echo "🚀 正在部署文件..."
|
||||||
|
rm -rf $ADMIN_DIR/*
|
||||||
cp -r /tmp/admin-deploy/* $ADMIN_DIR/
|
cp -r /tmp/admin-deploy/* $ADMIN_DIR/
|
||||||
|
|
||||||
|
# 设置权限
|
||||||
|
chown -R gitea:gitea $ADMIN_DIR
|
||||||
|
chmod -R 755 $ADMIN_DIR
|
||||||
|
|
||||||
# 清理临时文件
|
# 清理临时文件
|
||||||
rm -rf /tmp/admin-deploy /tmp/admin-dist.tar.gz
|
rm -rf /tmp/admin-deploy /tmp/admin-dist.tar.gz
|
||||||
|
|
||||||
echo '✅ 文件部署完成!'
|
echo "✅ 管理后台部署完成!"
|
||||||
"
|
|
||||||
|
|
||||||
- name: 🔍 健康检查
|
- name: 🔍 健康检查
|
||||||
run: |
|
uses: appleboy/ssh-action@v1.0.0
|
||||||
export SSHPASS=${{ secrets.ALIYUN_PWD }}
|
with:
|
||||||
|
host: ${{ secrets.ALIYUN_IP }}
|
||||||
sshpass -e ssh -o StrictHostKeyChecking=no -o ConnectTimeout=10 ${{ secrets.ALIYUN_USER_NAME }}@${{ secrets.ALIYUN_IP }} "
|
username: ${{ secrets.ALIYUN_USER_NAME }}
|
||||||
set -e
|
key: ${{ secrets.ALIYUN_SSH_KEY }}
|
||||||
echo '🔍 执行健康检查...'
|
port: 22
|
||||||
|
script: |
|
||||||
|
echo "🔍 执行健康检查..."
|
||||||
|
|
||||||
# 检查文件是否存在
|
# 检查文件是否存在
|
||||||
if [ -f '/home/gitea/www/photography-admin/index.html' ]; then
|
if [ -f '/home/gitea/www/photography-admin/index.html' ]; then
|
||||||
@ -189,7 +210,6 @@ jobs:
|
|||||||
# 重新加载 Caddy
|
# 重新加载 Caddy
|
||||||
sudo systemctl reload caddy
|
sudo systemctl reload caddy
|
||||||
echo '🔄 Caddy 配置已重新加载'
|
echo '🔄 Caddy 配置已重新加载'
|
||||||
"
|
|
||||||
|
|
||||||
security-scan:
|
security-scan:
|
||||||
name: 🔒 安全扫描
|
name: 🔒 安全扫描
|
||||||
|
|||||||
@ -102,31 +102,39 @@ jobs:
|
|||||||
NEXT_PUBLIC_SITE_NAME: 摄影作品集
|
NEXT_PUBLIC_SITE_NAME: 摄影作品集
|
||||||
run: bun run build
|
run: bun run build
|
||||||
|
|
||||||
- name: 🚀 部署到服务器
|
- name: 📤 上传文件到服务器
|
||||||
run: |
|
uses: appleboy/scp-action@v0.1.6
|
||||||
# 设置 SSH 环境
|
with:
|
||||||
export SSHPASS=${{ secrets.ALIYUN_PWD }}
|
host: ${{ secrets.ALIYUN_IP }}
|
||||||
|
username: ${{ secrets.ALIYUN_USER_NAME }}
|
||||||
|
key: ${{ secrets.ALIYUN_SSH_KEY }}
|
||||||
|
port: 22
|
||||||
|
source: "frontend/out/*"
|
||||||
|
target: "/home/gitea/www/photography/"
|
||||||
|
strip_components: 2
|
||||||
|
rm: true
|
||||||
|
|
||||||
# 并行执行:测试连接 + 创建目录
|
- name: 🔧 设置文件权限
|
||||||
sshpass -e ssh -o StrictHostKeyChecking=no -o ConnectTimeout=10 ${{ secrets.ALIYUN_USER_NAME }}@${{ secrets.ALIYUN_IP }} "
|
uses: appleboy/ssh-action@v1.0.0
|
||||||
mkdir -p /home/gitea/www/photography
|
with:
|
||||||
echo '✅ 连接和目录检查完成'
|
host: ${{ secrets.ALIYUN_IP }}
|
||||||
"
|
username: ${{ secrets.ALIYUN_USER_NAME }}
|
||||||
|
key: ${{ secrets.ALIYUN_SSH_KEY }}
|
||||||
|
port: 22
|
||||||
|
script: |
|
||||||
|
echo "🔧 设置文件权限..."
|
||||||
|
|
||||||
# 快速部署:跳过备份以提高速度
|
# 设置所有者
|
||||||
echo "🚀 快速部署新版本..."
|
chown -R gitea:gitea /home/gitea/www/photography
|
||||||
sshpass -e rsync -avz --delete --compress-level=9 --progress \
|
|
||||||
-e "ssh -o StrictHostKeyChecking=no" \
|
|
||||||
frontend/out/ ${{ secrets.ALIYUN_USER_NAME }}@${{ secrets.ALIYUN_IP }}:/home/gitea/www/photography/
|
|
||||||
|
|
||||||
# 并行设置权限和重载
|
# 设置权限
|
||||||
sshpass -e ssh -o StrictHostKeyChecking=no ${{ secrets.ALIYUN_USER_NAME }}@${{ secrets.ALIYUN_IP }} "
|
chmod -R 755 /home/gitea/www/photography
|
||||||
chown -R gitea:gitea /home/gitea/www/photography && \
|
find /home/gitea/www/photography -type f \( -name '*.html' -o -name '*.js' -o -name '*.css' -o -name '*.json' \) -exec chmod 644 {} \;
|
||||||
chmod -R 755 /home/gitea/www/photography && \
|
|
||||||
find /home/gitea/www/photography -type f \( -name '*.html' -o -name '*.js' -o -name '*.css' -o -name '*.json' \) -exec chmod 644 {} \; && \
|
# 重新加载 Caddy
|
||||||
sudo systemctl reload caddy && \
|
sudo systemctl reload caddy
|
||||||
echo '✅ 前端部署完成!'
|
|
||||||
"
|
echo "✅ 前端部署完成!"
|
||||||
|
|
||||||
- name: 🔍 健康检查
|
- name: 🔍 健康检查
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
Reference in New Issue
Block a user