change order of try-catch-finally and split out arm runs#16252
Merged
adityapatwardhan merged 9 commits intoPowerShell:masterfrom Oct 15, 2021
Merged
change order of try-catch-finally and split out arm runs#16252adityapatwardhan merged 9 commits intoPowerShell:masterfrom
adityapatwardhan merged 9 commits intoPowerShell:masterfrom
Conversation
Member
|
@TravisEz13 Can you please update the PR description with some more information about what this change is for? e.g. to enable new functionality? to fix an issue? |
Member
Author
|
description updated |
adityapatwardhan
approved these changes
Oct 15, 2021
daxian-dbw
pushed a commit
to daxian-dbw/PowerShell
that referenced
this pull request
Oct 21, 2021
|
🎉 Handy links: |
|
🎉 Handy links: |
TrapGodBrim
pushed a commit
to TrapGodBrim/PowerShell
that referenced
this pull request
Jan 19, 2022
Member
Author
|
/backport to release/v7.0.11 |
Contributor
|
Started backporting to release/v7.0.11: https://github.com/PowerShell/PowerShell/actions/runs/2242783372
|
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: use recommended style
Using index info to reconstruct a base tree...
M tools/ci.psm1
Falling back to patching base and 3-way merge...
Auto-merging tools/ci.psm1
CONFLICT (content): Merge conflict in tools/ci.psm1
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 use recommended style
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! |
Member
Author
|
I don't think we should backport to 7.0 |
Member
|
Packaging CI does not exist in CI. |
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
change order of try-catch-finally because the code never worked
PR Context
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.(which runs in a different PS Host).