Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to spliting our test work items by method instead of class. #44898

Open
wants to merge 14 commits into
base: release/9.0.1xx
Choose a base branch
from

Conversation

marcpopMSFT
Copy link
Member

Let's see if this works.

@dotnet-issue-labeler dotnet-issue-labeler bot added Area-Infrastructure untriaged Request triage from a team member labels Nov 15, 2024
@marcpopMSFT
Copy link
Member Author

/azp run dotnet-sdk-public-ci

Copy link

Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

Base automatically changed from marcpopMSFT-collectdump to release/9.0.1xx November 22, 2024 02:03
@marcpopMSFT
Copy link
Member Author

/backport to release/9.0.2xx

Copy link
Contributor

Started backporting to release/9.0.2xx: https://github.com/dotnet/sdk/actions/runs/12383167775

Copy link
Contributor

@marcpopMSFT backporting to release/9.0.2xx failed, the patch most likely resulted in conflicts:

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: Enable test timeout dump collection
Using index info to reconstruct a base tree...
M	test/HelixTasks/SDKCustomCreateXUnitWorkItemsWithTestExclusion.cs
Falling back to patching base and 3-way merge...
Auto-merging test/HelixTasks/SDKCustomCreateXUnitWorkItemsWithTestExclusion.cs
CONFLICT (content): Merge conflict in test/HelixTasks/SDKCustomCreateXUnitWorkItemsWithTestExclusion.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Enable test timeout dump collection
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-Infrastructure untriaged Request triage from a team member
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant