Skip to content

DOI-3830: fix: rebase and retry push with jitter on non-fast-forward #4

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

Open
yashkalwaniDW wants to merge 1 commit into
base: main
Choose a base branch
from
Open

DOI-3830: fix: rebase and retry push with jitter on non-fast-forward #4

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
16 changes: 14 additions & 2 deletions action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ inputs:
commit-timeout:
description: 'Commit timeout (in seconds)'
required: false
default: "60"
default: "180"
helm-dependency-build:
description: 'Run helm dependency build, only for helm toolchain, `true` or `false`'
required: false
Expand Down Expand Up @@ -442,7 +442,19 @@ runs:
git add -A
git status
git diff-index --quiet HEAD || git commit -m "Deploy ${{ github.repository }} SHA ${{ github.sha }} RUN ${{ github.run_id }} ATEMPT ${{ github.run_attempt }}"
git push origin ${{ steps.destination.outputs.ref }}
# Many jobs (one per app, across PRs) push to the same branch at once. If the push is
# rejected, fetch and rebase onto the latest remote and push again, with random jitter
# so competing jobs do not retry in lockstep. Paths are disjoint, so the rebase is clean.
REF='${{ steps.destination.outputs.ref }}'
for i in 1 2 3 4 5 6; do
git push origin "${REF}" && break
if [ "${i}" -eq 6 ]; then
echo "::error::push to ${REF} rejected after ${i} attempts"
exit 1
fi
sleep $(( (RANDOM % 8) + i ))
git pull --rebase origin "${REF}"
done

echo "sha=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT

Expand Down
Loading