From 80e9bba722b0f4ffcd0b93c8bf301d356b2e6b40 Mon Sep 17 00:00:00 2001 From: haosicheng Date: Sat, 11 Oct 2025 10:12:45 +0800 Subject: [PATCH] =?UTF-8?q?[patch]=20PDD=E7=99=BB=E5=BD=95=E7=8A=B6?= =?UTF-8?q?=E6=80=81GUI=E5=9B=9E=E8=B0=83=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/gui-version-release.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/gui-version-release.yml b/.gitea/workflows/gui-version-release.yml index c108783..2050371 100644 --- a/.gitea/workflows/gui-version-release.yml +++ b/.gitea/workflows/gui-version-release.yml @@ -163,9 +163,18 @@ jobs: Write-Host "Committing to branch: $BRANCH"; git commit -m "[skip ci] Update version to v$VERSION"; - git push origin $BRANCH; - Write-Host "Changes committed and pushed"; + Write-Host "Pulling latest changes before push..."; + git pull --rebase origin $BRANCH; + + if ($LASTEXITCODE -eq 0) { + Write-Host "Pushing changes..."; + git push origin $BRANCH; + Write-Host "Changes committed and pushed"; + } else { + Write-Host "Pull failed, trying force push..."; + git push origin $BRANCH; + } } else { Write-Host "No changes to commit"; }