From fa2ed523fadeaf519ca4998f3d2cfa4e7bcabd4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=88=BD=E5=93=92=E5=93=92?= Date: Sat, 21 Mar 2026 00:39:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=A5=E4=BD=9C=E6=B5=81?= =?UTF-8?q?=EF=BC=9Agit=20clone=E5=A4=B1=E8=B4=A5=E6=97=B6=E7=94=A8curl?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=EF=BC=8C=E6=89=80=E6=9C=89=E5=91=BD=E4=BB=A4?= =?UTF-8?q?=E5=8A=A0sudo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/deploy.yaml | 56 ++++++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 18 deletions(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 5a0bb20..383c2d7 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -12,42 +12,61 @@ jobs: username: quant password: 123quant-speed 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" SUDO_PASSWORD="123quant-speed" - # 1. 创建目标目录(如果不存在) + # sudo 函数 + run_sudo() { + echo "$SUDO_PASSWORD" | sudo -S "$@" + } + + # 1. 创建目标目录 echo "===== 创建目标目录: $TARGET_DIR =====" - mkdir -p $TARGET_DIR + run_sudo mkdir -p $TARGET_DIR + run_sudo chown -R quant:quant $TARGET_DIR # 2. 检查是否是 git 仓库 echo "===== 检查 git 仓库 =====" cd $TARGET_DIR if [ ! -d ".git" ]; then - echo "目录不是 git 仓库,进行克隆..." - git clone $REPO_URL . + echo "目录不是 git 仓库,尝试克隆..." + # 尝试 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 - # 3. 拉取 Git 最新代码 + # 3. 拉取 Git 最新代码(如果是 git 仓库) echo -e "\n===== 拉取 Git 代码 =====" - # 尝试拉取,如果失败则强制重置 - if ! git pull; then - echo "警告:Git pull 失败,尝试强制同步远程代码..." - git fetch --all - # 获取当前分支名并重置 - CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD) - git reset --hard origin/$CURRENT_BRANCH - git pull + if [ -d ".git" ]; then + if ! git pull; then + echo "警告:Git pull 失败,尝试强制同步..." + git fetch --all + CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD) + git reset --hard origin/$CURRENT_BRANCH + git pull + fi + else + echo "不是 git 仓库,跳过 pull" fi # 4. 停止并移除 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 文件 echo -e "\n===== 配置环境变量 =====" - mkdir -p backend - cat > backend/.env < /tmp/.env <<'EOF' # Database Configuration DB_NAME=scoring DB_USER=quant-speed @@ -64,9 +83,10 @@ jobs: ALIYUN_TINGWU_APP_KEY=6eOX7N3tKE0fDwb DASHSCOPE_API_KEY=sk-84e9eef24a274f568d4fa15c97556c9f EOF + run_sudo mv /tmp/.env backend/.env # 6. 重新启动 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===== 操作完成!====="