Repository navigation
Conversation
When another commit lands on the branch while the action is committing, rebuild the commit on the new head and retry (new `retries` input, default 3). Fail instead of overwriting files that changed on the branch since the commit they were read from, and only set the `commit` output once the branch update succeeds. Refs fjogeleit#533
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
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.
Fixes the failure from #533. When another commit lands on the branch while the action is committing,
updateReffails withUpdate is not a fast forward, and the fallback tocreateRefthen fails withReference already exists. We hit this regularly when several services update image tags in the same deployment repo at once. In #533 you mentioned there was no way to update the branch via the SDK; this rebuilds the commit on the new branch head and retries instead.retriestimes (new input, default3,0disables). OtherupdateReferrors still fall back tocreateRef.retries: 0.commitoutput is only set once the branch update succeeds.Tests are in
__tests__/git-processing.test.ts, anddist/is rebuilt. Happy to defaultretriesto0if you'd rather keep it opt-in.