ci: Make auto-commit step resilient to concurrent pushes#24
Merged
andygrunwald merged 1 commit intomainfrom May 3, 2026
Merged
ci: Make auto-commit step resilient to concurrent pushes#24andygrunwald merged 1 commit intomainfrom
andygrunwald merged 1 commit intomainfrom
Conversation
The stefanzweifel/git-auto-commit-action does not pull or rebase before pushing (this is a deliberate non-goal upstream). When this workflow runs concurrently with other actors pushing unrelated changes to main (e.g. a different folder), the action's internal git push is rejected as non-fast-forward and the workflow fails — even though the changes do not conflict. Switch to skip_push and add a small retry loop that does git pull --rebase between push attempts, mirroring the pattern already proven in the EngineeringKiosk/podcast-metadata workflows.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
The
stefanzweifel/git-auto-commit-actiondoes not pull or rebase before pushing — this is a deliberate non-goal upstream (see the action's README → "Limitations & Gotchas"). When this workflow runs concurrently with other actors pushing unrelated changes tomain(e.g. a different folder), the action's internalgit pushis rejected as non-fast-forward and the workflow fails, even though the changes do not conflict.This PR switches the auto-commit step to
skip_push: trueand adds a small shell retry loop that doesgit pull --rebasebetween push attempts. The pattern is the same as the one already proven in theEngineeringKiosk/podcast-metadataworkflows.Test plan
changes_detected == 'true'🤖 Generated with Claude Code