GeneralBots/generalbots
1
0
Fork 0
Code Activity Actions 5

CI: v18 - Use merge (not rebase), reset dirty state

Browse source 
- git reset --hard + git clean to avoid rebase conflicts
- Use git pull (merge) instead of pull --rebase
- Verified build times on runner:
  * botserver: 2s (incremental), 42s (cold)
  * botui: 9s (incremental)
This commit is contained in:
Rodrigo Rodriguez (Pragmatismo) 2026-04-18 19:11:52 -03:00
parent c11801fcd8
commit 91d0011ce7
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,7 @@
# HASH-BUSTER-20260418-CONTAINER-v17 # HASH-BUSTER-20260418-CONTAINER-v18
# Only build botserver (not entire workspace) # 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
name: BotServer CI/CD name: BotServer CI/CD
on: on:
@ -23,7 +24,9 @@ jobs:
run: | run: |
echo "=== Pull Latest ===" echo "=== Pull Latest ==="
cd /opt/gbo/work/botserver cd /opt/gbo/work/botserver
git pull --rebase git reset --hard HEAD
git clean -fd
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