GeneralBots/generalbots
1
0
Fork 0
Code Activity Actions 5

CI: v19 - Abort rebase first, then reset

Browse source 
- Add git rebase --abort to clear any stuck rebase state
- Then reset --hard + clean
- Prevents 'rebase in progress' errors
This commit is contained in:
Rodrigo Rodriguez (Pragmatismo) 2026-04-18 19:13:27 -03:00
parent 91d0011ce7
commit 178fc2e81c
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
.forgejo/workflows/botserver-v2.yaml
View file

@ -1,7 +1,7 @@
# HASH-BUSTER-20260418-CONTAINER-v18 # HASH-BUSTER-20260418-CONTAINER-v19
# Dev machine approach: /opt/gbo/work/botserver # Dev machine approach: /opt/gbo/work/botserver
# Pre-installed globally: Rust, Node.js, Python, sccache # Pre-installed globally: Rust, Node.js, Python, sccache
# NO REBASE - use merge to avoid conflicts # ABORT any rebase first, then reset + pull
name: BotServer CI/CD name: BotServer CI/CD
on: on:
@ -24,13 +24,22 @@ jobs:
run: | run: |
echo "=== Pull Latest ===" echo "=== Pull Latest ==="
cd /opt/gbo/work/botserver cd /opt/gbo/work/botserver
# Abort any rebase in progress
git rebase --abort 2>/dev/null || true
# Reset to clean state
git reset --hard HEAD git reset --hard HEAD
git clean -fd git clean -fd
# Pull latest (merge, not rebase)
git pull git pull
# Remove .github submodule (causes auth issues) # Remove .github submodule (causes auth issues)
rm -rf .github rm -rf .github
grep -v "github" .gitmodules > .gitmodules.tmp || true grep -v "github" .gitmodules > .gitmodules.tmp || true
mv .gitmodules.tmp .gitmodules mv .gitmodules.tmp .gitmodules
# Initialize only required submodules # Initialize only required submodules
git submodule update --init --recursive botlib botserver git submodule update --init --recursive botlib botserver