Skip to content

metrics: rebase-and-retry the commit-back push #13

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
christiankissig merged 2 commits into from
Jun 3, 2026
Merged

metrics: rebase-and-retry the commit-back push #13

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2744148
metrics: rebase-and-retry the commit-back push
christiankissig Jun 3, 2026
ca27cde
ci: trigger
christiankissig Jun 3, 2026
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
10 changes: 9 additions & 1 deletion .github/workflows/metrics.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,12 @@ jobs:
# Pushing with the default GITHUB_TOKEN does not retrigger workflows;
# [skip ci] is belt-and-suspenders. No-op stays green.
git commit -m "chore: update AFP metrics [skip ci]" || { echo "no changes"; exit 0; }
git push
# master may have advanced during the (multi-minute) run, which would
# reject the push; rebase onto the latest and retry a few times.
for attempt in 1 2 3 4 5; do
if git push; then exit 0; fi
echo "push rejected (attempt $attempt) - rebasing on origin/master ..."
git pull --rebase --autostash origin master
done
echo "failed to push metrics after retries" >&2
exit 1
Loading