Define $(HelixTestConfigurationFilePath)
#42029
Merged
Conversation
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
Contributor
dougbu
commented
Jun 3, 2022
dougbu
commented
- avoid problems caused by an undocumented dependency in the Helix SDK on the Arcade SDK
- symptoms were a complete lack of retries in our Helix work items
- avoid problems caused by an undocumented dependency in the Helix SDK on the Arcade SDK - symptoms were a complete lack of retries in our Helix work items
ghost
added
the
area-infrastructure
Contributor
Author
|
Will verify the correlation payload once one is created |
ChadNedzlek
approved these changes
Jun 3, 2022
HaoK
approved these changes
Jun 3, 2022
Contributor
Author
|
Confirmed https://helixde107v0xdeko0k025g8.blob.core.windows.net/helix-job-8f19fea5-77ca-4860-ae3e-3d79238f08782bfa14dac11468d9e/e4917645-eff2-4801-8c64-f03171d61b01.zip?helixlogtype=result correlation payload includes the test-configuration.json file 😄 |
Contributor
Author
|
/backport to release/6.0 |
Contributor
|
Started backporting to release/6.0: https://github.com/dotnet/aspnetcore/actions/runs/2437915250 |
Contributor
|
@dougbu backporting to release/6.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Define `$(HelixTestConfigurationFilePath)` - avoid problems caused by an undocumented dependency in the Helix SDK on the Arcade SDK - symptoms were a complete lack of retries in our Helix work items
Using index info to reconstruct a base tree...
M eng/helix/helix.proj
Falling back to patching base and 3-way merge...
Auto-merging eng/helix/helix.proj
CONFLICT (content): Merge conflict in eng/helix/helix.proj
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Define `$(HelixTestConfigurationFilePath)` - avoid problems caused by an undocumented dependency in the Helix SDK on the Arcade SDK - symptoms were a complete lack of retries in our Helix work items
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! |
dougbu
added a commit
that referenced
this pull request
Jun 9, 2022
- manual backport of #42029 - avoid problems caused by an undocumented dependency in the Helix SDK on the Arcade SDK - symptoms were a complete lack of retries in our Helix work items
captainsafia
pushed a commit
to captainsafia/aspnetcore
that referenced
this pull request
Jun 13, 2022
- avoid problems caused by an undocumented dependency in the Helix SDK on the Arcade SDK - symptoms were a complete lack of retries in our Helix work items
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.