viktor/infra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: stash local changes before git pull in CI pipelines

Browse source 
DevVM may have unstaged changes from active sessions. Use git stash
before pull to avoid 'cannot pull with rebase: unstaged changes' errors.
Stash pop after to restore working state.

[ci skip]

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Viktor Barzin 2026-04-15 17:37:10 +00:00
parent dcce76403a
commit f726d1c3fd
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.woodpecker/issue-automation.yml
View file

@ -50,7 +50,7 @@ steps:
echo "Labels: $ISSUE_LABELS" echo "Labels: $ISSUE_LABELS"
ssh -i /tmp/devvm-key -o StrictHostKeyChecking=no wizard@10.0.10.10 \ ssh -i /tmp/devvm-key -o StrictHostKeyChecking=no wizard@10.0.10.10 \
"cd ~/code && git -C infra pull --rebase && \ "cd ~/code && git -C infra stash && git -C infra pull --rebase && git -C infra stash pop 2>/dev/null; \
~/.local/bin/claude -p \ ~/.local/bin/claude -p \
--agent infra/.claude/agents/issue-responder \ --agent infra/.claude/agents/issue-responder \
--dangerously-skip-permissions \ --dangerously-skip-permissions \

2
scripts/postmortem-pipeline.sh
View file

@ -53,7 +53,7 @@ echo "SSH key fetched"
# 6. SSH to DevVM and run Claude Code headless # 6. SSH to DevVM and run Claude Code headless
TODOS=$(cat /tmp/todos.json) TODOS=$(cat /tmp/todos.json)
ssh -i /tmp/devvm-key -o StrictHostKeyChecking=no wizard@10.0.10.10 \ ssh -i /tmp/devvm-key -o StrictHostKeyChecking=no wizard@10.0.10.10 \
"cd ~/code && git -C infra pull && ~/.local/bin/claude -p \ "cd ~/code && git -C infra stash && git -C infra pull && git -C infra stash pop 2>/dev/null; ~/.local/bin/claude -p \
--agent infra/.claude/agents/postmortem-todo-resolver \ --agent infra/.claude/agents/postmortem-todo-resolver \
--dangerously-skip-permissions \ --dangerously-skip-permissions \
--max-budget-usd 5 \ --max-budget-usd 5 \