From fc8d7ecaad6665b6b4ee12a4db4795b25a26c696 Mon Sep 17 00:00:00 2001 From: Joe Date: Sun, 19 Jul 2026 20:53:25 +0800 Subject: [PATCH] ci: fix divergent branches by reset --hard origin/main --- .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 f4c51a4..fc9939d 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -19,8 +19,12 @@ jobs: WORK=/root/.cache/demo-go-api mkdir -p $WORK cd $WORK - [ -d .git ] || git clone http://joe:${GITEA_TOKEN}@192.168.1.212:3000/joe/demo-go-api.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-go-api.git . + fi - name: Login to Harbor run: docker login 192.168.1.212:1180 -u admin -p "$HARBOR_PASSWORD"