test(scorecard): preserve CR when retrying on conflict (backport #912) #913
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.
Welcome to Cryostat! 👋
Before contributing, make sure you have:
main
branch[chore, ci, docs, feat, fix, test]
git commit -S -m "YOUR_COMMIT_MESSAGE"
Fixes: #841
Description of the change:
cr
variable when callingUpdate
. If this fails due to a conflict, the update will be silently retried, butcr
will now be nil.Motivation for the change:
How to manually test:
make test-scorecard-local SCORECARD_TEST_SELECTION=cryostat-config-change
This is an automatic backport of pull request #912 done by [Mergify](https://mergify.com).