Publish global tool package for stable releases#15961
Merged
daxian-dbw merged 1 commit intoPowerShell:masterfrom Aug 20, 2021
Merged
Publish global tool package for stable releases#15961daxian-dbw merged 1 commit intoPowerShell:masterfrom
daxian-dbw merged 1 commit intoPowerShell:masterfrom
Conversation
5 tasks
iSazonov
approved these changes
Aug 20, 2021
rjmholt
approved these changes
Aug 20, 2021
xtqqczze
pushed a commit
to xtqqczze/PowerShell-PowerShell
that referenced
this pull request
Aug 20, 2021
|
🎉 Handy links: |
Member
|
/backport to release/v7.0.11 |
Contributor
|
Started backporting to release/v7.0.11: https://github.com/PowerShell/PowerShell/actions/runs/2242758814
|
Contributor
|
@TravisEz13 backporting to release/v7.0.11 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Publish global tool package for stable releases
Using index info to reconstruct a base tree...
M tools/releaseBuild/azureDevOps/templates/release-ReleaseToNuGet.yml
Falling back to patching base and 3-way merge...
Auto-merging tools/releaseBuild/azureDevOps/templates/release-ReleaseToNuGet.yml
CONFLICT (content): Merge conflict in tools/releaseBuild/azureDevOps/templates/release-ReleaseToNuGet.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Publish global tool package for stable releases
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! |
TravisEz13
pushed a commit
that referenced
this pull request
May 4, 2022
# Conflicts: # tools/releaseBuild/azureDevOps/templates/release-ReleaseToNuGet.yml
|
🎉 Handy links: |
22 tasks
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
4 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.
PR Summary
Fix #15930
Publish global tool package for stable releases, and skip the publishing for preview releases.
PR Checklist
.h,.cpp,.cs,.ps1and.psm1files have the correct copyright headerWIP:or[ WIP ]to the beginning of the title (theWIPbot will keep its status check atPendingwhile the prefix is present) and remove the prefix when the PR is ready.