Skip to content

fix(ci): refresh.sh resets the train's worktree before checking out the next PR #338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DrunkOnJava merged 1 commit into from
Oct 26, 2026
Merged

fix(ci): refresh.sh resets the train's worktree before checking out the next PR #338

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions tools/maintainer/train/refresh.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ git rev-parse origin/main > "$OUT/main.sha"
[ -d "$TRAIN_WORKTREE" ] || git worktree add -q --detach "$TRAIN_WORKTREE" origin/main || exit 2
cd "$TRAIN_WORKTREE" || exit 2
git merge --abort > /dev/null 2>&1
# The worktree is the train's own: a failed or dry refresh can leave regenerated files behind.
git reset -q --hard
git checkout -q --detach "origin/$B" || exit 2
base=$(git rev-parse HEAD)
map=$(python3 -I "$TRAIN_HERE/arch.py" renumber "$(git merge-base origin/main HEAD)" origin/main 2> "$OUT/renumber.log") || { say "REFUSED: section renumber failed: $(cat "$OUT/renumber.log")"; exit 4; }
Expand Down
Loading