From 57d1deb0a195ce393af21cca39cacb685bc84fe6 Mon Sep 17 00:00:00 2001 From: test Date: Sun, 19 Jul 2026 20:54:29 +0800 Subject: [PATCH] ci: fix divergent branches (reset --hard) --- .gitea/workflows/build.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 30f9dea..7a7d421 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -20,8 +20,12 @@ jobs: WORK=/root/.cache/demo-frontend mkdir -p $WORK cd $WORK - [ -d .git ] || git clone http://joe:${GITEA_TOKEN}@192.168.1.212:3000/joe/demo-frontend.git . - git pull + if [ -d .git ]; then + git reset --hard origin/main + git clean -fd + else + git clone http://joe:${GITEA_TOKEN}@192.168.1.212:3000/joe/demo-frontend.git . + fi SHORT_SHA=${GITHUB_SHA::8} cat > package.json <