GeneralBots/botserver
2
1
Fork 0
Code Activity Actions

Fix CI: Handle divergent submodule histories with fetch+reset
Some checks failed
BotServer CI/CD / build (push) Failing after 5s
Details

Browse source 
- 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 <noreply@anthropic.com>
This commit is contained in:
Rodrigo Rodriguez (Pragmatismo) 2026-04-10 12:12:48 -03:00
parent aaccd741e3
commit 5e955d3196
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.forgejo/workflows/botserver.yaml
View file

@ -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