Disable realtime monitoring in the PR-validation pipeline#77282
Merged
akhera99 merged 1 commit intodotnet:mainfrom Feb 19, 2025
Merged
Disable realtime monitoring in the PR-validation pipeline#77282akhera99 merged 1 commit intodotnet:mainfrom
akhera99 merged 1 commit intodotnet:mainfrom
Conversation
dibarbet
approved these changes
Feb 19, 2025
ToddGrun
approved these changes
Feb 19, 2025
Member
Author
|
/backport to release/dev17.13 |
Contributor
|
Started backporting to release/dev17.13: https://github.com/dotnet/roslyn/actions/runs/13445389102 |
Member
Author
|
/backport to release/dev17.14 |
Contributor
|
Started backporting to release/dev17.14: https://github.com/dotnet/roslyn/actions/runs/13445415055 |
Member
Author
|
/backport to release/dev17.12 |
Contributor
|
Started backporting to release/dev17.12: https://github.com/dotnet/roslyn/actions/runs/13445418149 |
2 tasks
Member
Author
|
/backport to release/dev17.10 |
Contributor
|
Started backporting to release/dev17.10: https://github.com/dotnet/roslyn/actions/runs/13445436824 |
Member
Author
|
/backport to release/dev17.8 |
Contributor
|
Started backporting to release/dev17.8: https://github.com/dotnet/roslyn/actions/runs/13445439348 |
2 tasks
Contributor
|
@akhera99 backporting to "release/dev17.12" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: disable realtime monitoring
.git/rebase-apply/patch:15: trailing whitespace.
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M azure-pipelines-pr-validation.yml
Falling back to patching base and 3-way merge...
Auto-merging azure-pipelines-pr-validation.yml
CONFLICT (content): Merge conflict in azure-pipelines-pr-validation.yml
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 set advice.mergeConflict false"
Patch failed at 0001 disable realtime monitoring
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
Contributor
|
@akhera99 backporting to "release/dev17.10" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: disable realtime monitoring
.git/rebase-apply/patch:15: trailing whitespace.
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M azure-pipelines-pr-validation.yml
Falling back to patching base and 3-way merge...
Auto-merging azure-pipelines-pr-validation.yml
CONFLICT (content): Merge conflict in azure-pipelines-pr-validation.yml
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 set advice.mergeConflict false"
Patch failed at 0001 disable realtime monitoring
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
Contributor
|
@akhera99 backporting to "release/dev17.8" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: disable realtime monitoring
.git/rebase-apply/patch:15: trailing whitespace.
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M azure-pipelines-pr-validation.yml
Falling back to patching base and 3-way merge...
Auto-merging azure-pipelines-pr-validation.yml
CONFLICT (content): Merge conflict in azure-pipelines-pr-validation.yml
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 set advice.mergeConflict false"
Patch failed at 0001 disable realtime monitoring
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
akhera99
added a commit
that referenced
this pull request
Feb 20, 2025
…ipeline (#77300) Backport of #77282 to release/dev17.13 /cc @akhera99 ## Customer Impact ## Regression - [ ] Yes - [ ] No [If yes, specify when the regression was introduced. Provide the PR or commit if known.] ## Testing [How was the fix verified? How was the issue missed previously? What tests were added?] ## Risk [High/Medium/Low. Justify the indication by mentioning how risks were measured and addressed.]
This was referenced Feb 25, 2025
akhera99
added a commit
that referenced
this pull request
Feb 27, 2025
…ipeline (#77301) Backport of #77282 to release/dev17.14 /cc @akhera99 ## Customer Impact ## Regression - [ ] Yes - [ ] No [If yes, specify when the regression was introduced. Provide the PR or commit if known.] ## Testing [How was the fix verified? How was the issue missed previously? What tests were added?] ## Risk [High/Medium/Low. Justify the indication by mentioning how risks were measured and addressed.]
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.
No description provided.