修复工作流:git clone失败时用curl下载,所有命令加sudo
Some checks failed
Deploy to Server / deploy (push) Failing after 4s
Some checks failed
Deploy to Server / deploy (push) Failing after 4s
This commit is contained in:
@@ -12,42 +12,61 @@ jobs:
|
|||||||
username: quant
|
username: quant
|
||||||
password: 123quant-speed
|
password: 123quant-speed
|
||||||
script: |
|
script: |
|
||||||
TARGET_DIR="/home/quant/data/dev/scoring-system"
|
TARGET_DIR="/home/quant/data/dev/deploy"
|
||||||
REPO_URL="https://gitea.tangledup-ai.com/quant-speed-AI/Scoring-System.git"
|
REPO_URL="https://gitea.tangledup-ai.com/quant-speed-AI/Scoring-System.git"
|
||||||
SUDO_PASSWORD="123quant-speed"
|
SUDO_PASSWORD="123quant-speed"
|
||||||
|
|
||||||
# 1. 创建目标目录(如果不存在)
|
# sudo 函数
|
||||||
|
run_sudo() {
|
||||||
|
echo "$SUDO_PASSWORD" | sudo -S "$@"
|
||||||
|
}
|
||||||
|
|
||||||
|
# 1. 创建目标目录
|
||||||
echo "===== 创建目标目录: $TARGET_DIR ====="
|
echo "===== 创建目标目录: $TARGET_DIR ====="
|
||||||
mkdir -p $TARGET_DIR
|
run_sudo mkdir -p $TARGET_DIR
|
||||||
|
run_sudo chown -R quant:quant $TARGET_DIR
|
||||||
|
|
||||||
# 2. 检查是否是 git 仓库
|
# 2. 检查是否是 git 仓库
|
||||||
echo "===== 检查 git 仓库 ====="
|
echo "===== 检查 git 仓库 ====="
|
||||||
cd $TARGET_DIR
|
cd $TARGET_DIR
|
||||||
if [ ! -d ".git" ]; then
|
if [ ! -d ".git" ]; then
|
||||||
echo "目录不是 git 仓库,进行克隆..."
|
echo "目录不是 git 仓库,尝试克隆..."
|
||||||
git clone $REPO_URL .
|
# 尝试 git clone,失败则使用 curl 下载
|
||||||
|
if ! git clone $REPO_URL . 2>/dev/null; then
|
||||||
|
echo "Git clone 失败,使用 curl 下载代码..."
|
||||||
|
cd /tmp
|
||||||
|
curl -L -o scoring-system.tar.gz "https://gitea.tangledup-ai.com/quant-speed-AI/Scoring-System/archive/refs/heads/main.tar.gz" || exit 1
|
||||||
|
run_sudo tar -xzf scoring-system.tar.gz -C $TARGET_DIR
|
||||||
|
run_sudo mv $TARGET_DIR/Scoring-System-*/* $TARGET_DIR/ 2>/dev/null || run_sudo mv $TARGET_DIR/Scoring-System/* $TARGET_DIR/
|
||||||
|
run_sudo rm -rf $TARGET_DIR/Scoring-System-* $TARGET_DIR/Scoring-System
|
||||||
|
rm scoring-system.tar.gz
|
||||||
|
run_sudo chown -R quant:quant $TARGET_DIR
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 3. 拉取 Git 最新代码
|
# 3. 拉取 Git 最新代码(如果是 git 仓库)
|
||||||
echo -e "\n===== 拉取 Git 代码 ====="
|
echo -e "\n===== 拉取 Git 代码 ====="
|
||||||
# 尝试拉取,如果失败则强制重置
|
if [ -d ".git" ]; then
|
||||||
if ! git pull; then
|
if ! git pull; then
|
||||||
echo "警告:Git pull 失败,尝试强制同步远程代码..."
|
echo "警告:Git pull 失败,尝试强制同步..."
|
||||||
git fetch --all
|
git fetch --all
|
||||||
# 获取当前分支名并重置
|
|
||||||
CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
|
CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
|
||||||
git reset --hard origin/$CURRENT_BRANCH
|
git reset --hard origin/$CURRENT_BRANCH
|
||||||
git pull
|
git pull
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
|
echo "不是 git 仓库,跳过 pull"
|
||||||
|
fi
|
||||||
|
|
||||||
# 4. 停止并移除 Docker 容器
|
# 4. 停止并移除 Docker 容器
|
||||||
echo -e "\n===== 停止并清理 Docker ====="
|
echo -e "\n===== 停止并清理 Docker ====="
|
||||||
echo $SUDO_PASSWORD | sudo -S docker compose down
|
echo "$SUDO_PASSWORD" | sudo -S docker compose down 2>/dev/null || true
|
||||||
|
|
||||||
# 5. 创建/更新 .env 文件
|
# 5. 创建/更新 .env 文件
|
||||||
echo -e "\n===== 配置环境变量 ====="
|
echo -e "\n===== 配置环境变量 ====="
|
||||||
mkdir -p backend
|
run_sudo mkdir -p backend
|
||||||
cat > backend/.env <<EOF
|
run_sudo chown -R quant:quant backend
|
||||||
|
cat > /tmp/.env <<'EOF'
|
||||||
# Database Configuration
|
# Database Configuration
|
||||||
DB_NAME=scoring
|
DB_NAME=scoring
|
||||||
DB_USER=quant-speed
|
DB_USER=quant-speed
|
||||||
@@ -64,9 +83,10 @@ jobs:
|
|||||||
ALIYUN_TINGWU_APP_KEY=6eOX7N3tKE0fDwb
|
ALIYUN_TINGWU_APP_KEY=6eOX7N3tKE0fDwb
|
||||||
DASHSCOPE_API_KEY=sk-84e9eef24a274f568d4fa15c97556c9f
|
DASHSCOPE_API_KEY=sk-84e9eef24a274f568d4fa15c97556c9f
|
||||||
EOF
|
EOF
|
||||||
|
run_sudo mv /tmp/.env backend/.env
|
||||||
|
|
||||||
# 6. 重新启动 Docker 容器
|
# 6. 重新启动 Docker 容器
|
||||||
echo -e "\n===== 启动 Docker 容器 ====="
|
echo -e "\n===== 启动 Docker 容器 ====="
|
||||||
echo $SUDO_PASSWORD | sudo -S docker compose up -d --build
|
echo "$SUDO_PASSWORD" | sudo -S docker compose up -d --build
|
||||||
|
|
||||||
echo -e "\n===== 操作完成!====="
|
echo -e "\n===== 操作完成!====="
|
||||||
|
|||||||
Reference in New Issue
Block a user