fix: Update signed-commit action to fix issues with unstaged or conflicted files#22
Merged
Conversation
vladfrangu
approved these changes
May 19, 2026
Member
vladfrangu
left a comment
vladfrangu
left a comment
There was a problem hiding this comment.
Lgtm but can we maybe autoadd based on what we had staged before pulling?
Member
Author
|
It should add only what was passed to the |
fnesveda
pushed a commit
that referenced
this pull request
May 19, 2026
🤖 I have created a release *beep* *boop* --- ## [1.2.0](v1.1.2...v1.2.0) (2026-05-19) ### Features * Update of MongoDB index checker, prompt, deduplication, etc. ([#17](#17)) ([86b91e4](86b91e4)) ### Bug Fixes * Update `signed-commit` action to fix issues with unstaged or conflicted files ([#22](#22)) ([5e8686c](5e8686c)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
fnesveda
added a commit
to apify/apify-actor-docker
that referenced
this pull request
May 19, 2026
The `signed-commit` action did not handle retries on concurrent updates well, causing some of the release workflows to silently not commit the updated changes. The new version [fixes](apify/actions#22) this.
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
3 participants
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.
The
signed-commitaction had two issues:pull: --rebase --autostash, and the pull happens after a retry, it unstages all staged changes, and nothing gets committedgit pull --rebase --autostashcommand, the action would happily commit the files with the conflictsThis fixes both of them by:
git addagain after thegit pullon a retryTests are generated by Claude, perhaps they're a bit overdone but this repo is so low traffic that it doesn't matter much.