diff --git a/.github/actions/pull_rebase_push_retry/action.yml b/.github/actions/pull_rebase_push_retry/action.yml index eeb0db3cf9e939d..e4059ef7f34b382 100644 --- a/.github/actions/pull_rebase_push_retry/action.yml +++ b/.github/actions/pull_rebase_push_retry/action.yml @@ -4,14 +4,22 @@ runs: using: "composite" steps: + - name: Debug Git Status + run: | + git remote -v + git branch -v + git status + git config --list + shell: bash + # we'll just die if there is a merge conflict # but we can recover from pull-push-pull race conditions - name: push results run: | for retry in {1..10} do - git pull --rebase - git push && break + git pull --rebase -v || exit 1 + git push -v && break sleep $[ ( $RANDOM % 10 ) + 1] done shell: bash