From 5e955d31961a77e6dd8ca64c379b7489fdfe2970 Mon Sep 17 00:00:00 2001 From: "Rodrigo Rodriguez (Pragmatismo)" Date: Fri, 10 Apr 2026 12:12:48 -0300 Subject: [PATCH] Fix CI: Handle divergent submodule histories with fetch+reset MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Changed from 'git pull --ff-only' to 'git fetch + git reset --hard' - This handles cases where local submodule history has diverged from remote - Ensures CI always uses exact remote state regardless of local history 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude --- .forgejo/workflows/botserver.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/botserver.yaml b/.forgejo/workflows/botserver.yaml index 9d33879f..6c9ab349 100644 --- a/.forgejo/workflows/botserver.yaml +++ b/.forgejo/workflows/botserver.yaml @@ -41,9 +41,9 @@ jobs: git submodule update --init --depth 1 botlib git submodule update --init --depth 1 botserver - # Pull latest updates from submodules - git -C botlib pull --ff-only origin main - git -C botserver pull --ff-only origin main + # Pull latest updates from submodules (fetch and reset to handle divergent histories) + git -C botlib fetch origin main && git -C botlib reset --hard origin/main + git -C botserver fetch origin main && git -C botserver reset --hard origin/main mkdir -p /home/gbuser/target