fix: drop unnecessary 2>&1 redirect and add backoff with jitter between push retries

jamesfredley · jamesfredley · commit c4a92cfc3b16 · 2026-03-21T14:51:43.000-04:00
Remove the unnecessary stderr redirect on git push (only exit code matters
for the if-condition). Add incremental backoff with jitter between retry
attempts to reduce collision probability when multiple concurrent jobs
race to push.

Assisted-by: Claude Code &lt;Claude@Claude.ai&gt;
diff --git a/deploy-github-pages/entrypoint.sh b/deploy-github-pages/entrypoint.sh
@@ -321,7 +321,7 @@ MAX_PUSH_ATTEMPTS=5
 PUSH_ATTEMPT=1
 while [ $PUSH_ATTEMPT -le $MAX_PUSH_ATTEMPTS ]; do
   echo "Push attempt ${PUSH_ATTEMPT}/${MAX_PUSH_ATTEMPTS}"
-  if git push "${GIT_REPO_URL}" "${DOCUMENTATION_BRANCH}" 2>&1; then
+  if git push "${GIT_REPO_URL}" "${DOCUMENTATION_BRANCH}"; then
     echo "Deployment successful!"
     break
   fi
@@ -330,7 +330,10 @@ while [ $PUSH_ATTEMPT -le $MAX_PUSH_ATTEMPTS ]; do
     exit 1
   fi
   echo "Push rejected, pulling remote changes and retrying..."
-  git pull --rebase "${GIT_REPO_URL}" "${DOCUMENTATION_BRANCH}"
   PUSH_ATTEMPT=$((PUSH_ATTEMPT + 1))
+  BACKOFF=$(( (PUSH_ATTEMPT * 2) + (RANDOM % 3) ))
+  echo "Waiting ${BACKOFF}s before retry..."
+  sleep $BACKOFF
+  git pull --rebase "${GIT_REPO_URL}" "${DOCUMENTATION_BRANCH}"
 done
 echo "::endgroup::"
