From c73482e8278f8661b1e208ac871d05561464da3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Sat, 10 Jan 2026 13:27:53 +0800 Subject: [PATCH] xx --- .devops/deployer.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.devops/deployer.py b/.devops/deployer.py index 5525805..078961e 100644 --- a/.devops/deployer.py +++ b/.devops/deployer.py @@ -294,10 +294,15 @@ class Deployer: commit_msg = self.config['deploy']['commit_message'].format( repo_name=repo_config['name'] ) - + if not self.run_command(f'git commit -m "{commit_msg}"', cwd=repo_path): return False + # 推送前先拉取远程最新代码 + self.logger.info("推送前先拉取远程最新代码...") + if not self.run_command(f"git pull --rebase origin {self.main_repo_branch}", cwd=repo_path): + self.logger.warning("拉取远程代码失败，尝试直接推送") + # 推送到远程 if not self.run_command(f"git push origin {self.main_repo_branch}", cwd=repo_path): self.logger.warning("推送失败，但部署已完成")