Cleanup release preparation stage #4744
Merged
Conversation
This file contains 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
jander-msft
added
the
backport
ghost
added
the
jander-msft
added
servicing-patch
wiktork
approved these changes
Jun 26, 2023
jander-msft
changed the title
|
/backport to release/7.2 |
|
Started backporting to release/7.2: https://github.com/dotnet/dotnet-monitor/actions/runs/5384715520 |
|
@jander-msft backporting to release/7.2 failed, the patch most likely resulted in conflicts. Please backport manually using one of the below commands, followed by PowerShell (Invoke-WebRequest "https://github.com/dotnet/dotnet-monitor/commit/a4a599c4a09a61bf527f924d9e502cbeea32c302.patch").Content | git am --3way --ignore-whitespace --exclude="documentation/**.md" --keep-non-patchBash curl -sSL "https://github.com/dotnet/dotnet-monitor/commit/a4a599c4a09a61bf527f924d9e502cbeea32c302.patch" | git am --3way --ignore-whitespace --exclude="documentation/**.md" --keep-non-patch
$ git am --3way --ignore-whitespace --exclude="documentation/**.md" --keep-non-patch changes.patch
Patch format detection failed.
Error: The process '/usr/bin/git' failed with exit code 128 |
|
/backport to release/6.x |
|
Started backporting to release/6.x: https://github.com/dotnet/dotnet-monitor/actions/runs/5384720299 |
|
@jander-msft backporting to release/6.x failed, the patch most likely resulted in conflicts. Please backport manually using one of the below commands, followed by PowerShell (Invoke-WebRequest "https://github.com/dotnet/dotnet-monitor/commit/a4a599c4a09a61bf527f924d9e502cbeea32c302.patch").Content | git am --3way --ignore-whitespace --exclude="documentation/**.md" --keep-non-patchBash curl -sSL "https://github.com/dotnet/dotnet-monitor/commit/a4a599c4a09a61bf527f924d9e502cbeea32c302.patch" | git am --3way --ignore-whitespace --exclude="documentation/**.md" --keep-non-patch
$ git am --3way --ignore-whitespace --exclude="documentation/**.md" --keep-non-patch changes.patch
Patch format detection failed.
Error: The process '/usr/bin/git' failed with exit code 128 |
jander-msft
removed
servicing-patch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
Manual backport of #4175 to
release/7.xExample non-release build: https://dev.azure.com/dnceng/internal/_build/results?buildId=2209662&view=results
Example test release build: https://dev.azure.com/dnceng/internal/_build/results?buildId=2209688&view=results
Release Notes Entry