diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index e797262..cebcfde 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -13,29 +13,32 @@ jobs: deploy: runs-on: [self-hosted, rent-deploy] steps: - - name: Clone or update code + - name: Prepare code run: | WORK_DIR="/tmp/rent-deploy" + # Gitea 仓库在宿主机的实际路径 + GITEA_REPO="/www/dk_project/dk_app/gitea/gitea_P4dS/gitea/gitea/repositories/xiaoquan/rent.git" - # 使用宿主机的 Gitea 端口 - GITEA_URL="http://host.docker.internal:10082/xiaoquan/rent.git" + echo "准备代码目录..." - if [ -d "$WORK_DIR" ]; then - echo "代码目录已存在,拉取最新代码..." + if [ -d "$WORK_DIR/.git" ]; then + echo "代码目录已存在,更新代码..." cd $WORK_DIR - git fetch --all + git fetch origin + git checkout ${{ github.ref_name }} git reset --hard origin/${{ github.ref_name }} else - echo "首次克隆代码..." - # 尝试多个可能的地址 - git clone $GITEA_URL $WORK_DIR || \ - git clone http://172.17.0.1:10082/xiaoquan/rent.git $WORK_DIR || \ - git clone http://localhost:10082/xiaoquan/rent.git $WORK_DIR - + echo "首次初始化代码..." + rm -rf $WORK_DIR + mkdir -p $WORK_DIR cd $WORK_DIR - git checkout ${{ github.ref_name }} + git init + git remote add origin $GITEA_REPO + git fetch origin + git checkout -b ${{ github.ref_name }} origin/${{ github.ref_name }} fi + echo "✅ 代码准备完成" echo "当前分支: $(git branch --show-current)" echo "最新提交: $(git log -1 --oneline)"