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

Updated tsaoptions.json to direct issues to runtime owners #108410

Merged
merged 2 commits into from
Sep 30, 2024

Conversation

artl93
Copy link
Member

@artl93 artl93 commented Sep 30, 2024

Updated tsaoptions.json to direct issues to the runtime service tree.

@dotnet-issue-labeler dotnet-issue-labeler bot added the needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners label Sep 30, 2024
Copy link
Contributor

Tagging subscribers to this area: @dotnet/area-meta
See info in area-owners.md if you want to be subscribed.

Copy link
Member

@jeffschwMSFT jeffschwMSFT left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@am11 am11 removed the needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners label Sep 30, 2024
@artl93 artl93 merged commit a0790e9 into dotnet:main Sep 30, 2024
143 of 148 checks passed
@artl93 artl93 deleted the artl93/updatetsaoptions branch September 30, 2024 22:15
@artl93
Copy link
Member Author

artl93 commented Oct 1, 2024

/backport to release/9.0

Copy link
Contributor

github-actions bot commented Oct 1, 2024

Started backporting to release/9.0: https://github.com/dotnet/runtime/actions/runs/11132636000

@artl93
Copy link
Member Author

artl93 commented Oct 1, 2024

/backport to release/8.0-staging

@artl93
Copy link
Member Author

artl93 commented Oct 1, 2024

/backport to release/6.0-staging

Copy link
Contributor

github-actions bot commented Oct 1, 2024

Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/11132643000

Copy link
Contributor

github-actions bot commented Oct 1, 2024

Started backporting to release/6.0-staging: https://github.com/dotnet/runtime/actions/runs/11132644522

Copy link
Contributor

github-actions bot commented Oct 1, 2024

@artl93 backporting to release/6.0-staging failed, the patch most likely resulted in conflicts:

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

Applying: Updated tsaoptions.json to direct issues properly.
Using index info to reconstruct a base tree...
A	.config/tsaoptions.json
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): .config/tsaoptions.json deleted in HEAD and modified in Updated tsaoptions.json to direct issues properly.. Version Updated tsaoptions.json to direct issues properly. of .config/tsaoptions.json left in tree.
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 Updated tsaoptions.json to direct issues properly.
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

Copy link
Contributor

github-actions bot commented Oct 1, 2024

@artl93 an error occurred while backporting to release/6.0-staging, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.

sirntar pushed a commit to sirntar/runtime that referenced this pull request Oct 3, 2024
lambdageek pushed a commit to lambdageek/runtime that referenced this pull request Oct 3, 2024
@github-actions github-actions bot locked and limited conversation to collaborators Nov 1, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants