Add named mutex to packing TestTemplates project that is used by multiple tests running in parallel#5338
Merged
GangWang01 merged 2 commits intodotnet:mainfrom Oct 13, 2022
Merged
Conversation
…iple tests running in parallel
cd23a70 to
ed96ec5
Compare
JanKrivanek
requested changes
Sep 29, 2022
Member
JanKrivanek
left a comment
There was a problem hiding this comment.
Thanks for the change!
I have couple of requests for improvements.
3375aec to
1613108
Compare
…age and add exit code info
1613108 to
30b2d20
Compare
Member
|
/backport to release/7.0.2xx |
Contributor
|
Started backporting to release/7.0.2xx: https://github.com/dotnet/templating/actions/runs/3265116934 |
Member
Author
|
/backport to release/7.0.1xx |
Contributor
|
Started backporting to release/7.0.1xx: https://github.com/dotnet/templating/actions/runs/3598304196 |
Contributor
|
@GangWang01 backporting to release/7.0.1xx failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Add named mutex to packing TestTemplates project that is used by multiple tests running in parallel
Using index info to reconstruct a base tree...
M test/Microsoft.TemplateEngine.TestHelper/PackageManager.cs
Falling back to patching base and 3-way merge...
Auto-merging test/Microsoft.TemplateEngine.TestHelper/PackageManager.cs
CONFLICT (content): Merge conflict in test/Microsoft.TemplateEngine.TestHelper/PackageManager.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add named mutex to packing TestTemplates project that is used by multiple tests running in parallel
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
Contributor
|
@GangWang01 an error occurred while backporting to release/7.0.1xx, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
Merged
2 tasks
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.
Problem
#5286
Solution
Add named mutex to prevent concurrent attempts to create same pack for Microsoft.TemplateEngine.TestTemplates.
Checks:
#nullable enableto all the modified files ?