Fix mariner mappings by TravisEz13 · Pull Request #17413 · PowerShell/PowerShell

TravisEz13 · 2022-05-23T17:36:50Z

PR Summary

PR Context

PR Checklist

pull-request-quantifier-deprecated · 2022-05-23T17:36:54Z

This PR has 4 quantified lines of changes. In general, a change size of upto 200 lines is ideal for the best PR experience!

Quantification details

Label      : Extra Small
Size       : +2 -2
Percentile : 1.6%

Total files changed: 1

Change summary by file extension:
.json : +2 -2

Change counts above are quantified counts, based on the PullRequestQuantifier customizations.

Why proper sizing of changes matters

Optimal pull request sizes drive a better predictable PR flow as they strike a
balance between between PR complexity and PR review overhead. PRs within the
optimal size (typical small, or medium sized PRs) mean:

Fast and predictable releases to production:
- Optimal size changes are more likely to be reviewed faster with fewer
  iterations.
- Similarity in low PR complexity drives similar review times.
Review quality is likely higher as complexity is lower:
- Bugs are more likely to be detected.
- Code inconsistencies are more likely to be detetcted.
Knowledge sharing is improved within the participants:
- Small portions can be assimilated better.
Better engineering practices are exercised:
- Solving big problems by dividing them in well contained, smaller problems.
- Exercising separation of concerns within the code changes.

What can I do to optimize my changes

Use the PullRequestQuantifier to quantify your PR accurately
- Create a context profile for your repo using the context generator
- Exclude files that are not necessary to be reviewed or do not increase the review complexity. Example: Autogenerated code, docs, project IDE setting files, binaries, etc. Check out the Excluded section from your prquantifier.yaml context profile.
- Understand your typical change complexity, drive towards the desired complexity by adjusting the label mapping in your prquantifier.yaml context profile.
- Only use the labels that matter to you, see context specification to customize your prquantifier.yaml context profile.
Change your engineering behaviors
- For PRs that fall outside of the desired spectrum, review the details and check if:
  - Your PR could be split in smaller, self-contained PRs instead
  - Your PR only solves one particular issue. (For example, don't refactor and code new features in the same PR).

How to interpret the change counts in git diff output

One line was added: +1 -0
One line was deleted: +0 -1
One line was modified: +1 -1 (git diff doesn't know about modified, it will
interpret that line like one addition plus one deletion)
Change percentiles: Change characteristics (addition, deletion, modification)
of this PR in relation to all other PRs within the repository.

Was this comment helpful? 👍 :ok_hand: :thumbsdown: (Email)
Customize PullRequestQuantifier for this repository.

TravisEz13 · 2022-05-23T22:35:13Z

/backport to release/v7.2.5

github-actions · 2022-05-23T22:35:47Z

Started backporting to release/v7.2.5: https://github.com/PowerShell/PowerShell/actions/runs/2374311804

GitHub
Fix mariner mappings · PowerShell/PowerShell@957b7bd
PowerShell for every system! Contribute to PowerShell/PowerShell development by creating an account on GitHub.

github-actions · 2022-05-23T22:36:17Z

@TravisEz13 backporting to release/v7.2.5 failed, the patch most likely resulted in conflicts:

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

Applying: Fix mariner mappings
Using index info to reconstruct a base tree...
M	tools/packages.microsoft.com/mapping.json
Falling back to patching base and 3-way merge...
Auto-merging tools/packages.microsoft.com/mapping.json
CONFLICT (content): Merge conflict in tools/packages.microsoft.com/mapping.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix mariner mappings
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 128

Please backport manually!

adityapatwardhan · 2022-05-24T20:59:09Z

/backport to release/v7.2.5

github-actions · 2022-05-24T20:59:24Z

Started backporting to release/v7.2.5: https://github.com/PowerShell/PowerShell/actions/runs/2380566246

GitHub
Fix mariner mappings · PowerShell/PowerShell@736cf3e
PowerShell for every system! Contribute to PowerShell/PowerShell development by creating an account on GitHub.

github-actions · 2022-05-24T20:59:39Z

@adityapatwardhan backporting to release/v7.2.5 failed, the patch most likely resulted in conflicts:

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

Applying: Fix mariner mappings
Using index info to reconstruct a base tree...
M	tools/packages.microsoft.com/mapping.json
Falling back to patching base and 3-way merge...
Auto-merging tools/packages.microsoft.com/mapping.json
CONFLICT (content): Merge conflict in tools/packages.microsoft.com/mapping.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix mariner mappings
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 128

Please backport manually!

# Conflicts: # tools/packages.microsoft.com/mapping.json

TravisEz13 · 2022-05-31T18:05:50Z

/backport to release/v7.2.5

github-actions · 2022-05-31T18:06:07Z

Started backporting to release/v7.2.5: https://github.com/PowerShell/PowerShell/actions/runs/2416850560

GitHub
Fix mariner mappings · PowerShell/PowerShell@5b64077
PowerShell for every system! Contribute to PowerShell/PowerShell development by creating an account on GitHub.

github-actions · 2022-05-31T18:06:21Z

@TravisEz13 backporting to release/v7.2.5 failed, the patch most likely resulted in conflicts:

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

Applying: Fix mariner mappings
Using index info to reconstruct a base tree...
M	tools/packages.microsoft.com/mapping.json
Falling back to patching base and 3-way merge...
Auto-merging tools/packages.microsoft.com/mapping.json
CONFLICT (content): Merge conflict in tools/packages.microsoft.com/mapping.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix mariner mappings
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 128

Please backport manually!

TravisEz13 · 2022-05-31T18:13:10Z

backported to 7.2 5c804e2

ghost · 2022-06-21T18:34:40Z

🎉v7.2.5 has been released which incorporates this pull request.:tada:

Handy links:

Release Notes

ghost · 2022-06-22T20:25:07Z

🎉v7.3.0-preview.5 has been released which incorporates this pull request.:tada:

Handy links:

Release Notes

Fix mariner mappings

c832d34

TravisEz13 requested review from PaulHigin, adityapatwardhan, anmenaga and daxian-dbw as code owners May 23, 2022 17:36

ghost assigned PaulHigin May 23, 2022

pull-request-quantifier-deprecated bot added the Extra Small label May 23, 2022

adityapatwardhan approved these changes May 23, 2022

View reviewed changes

PaulHigin approved these changes May 23, 2022

View reviewed changes

TravisEz13 merged commit 90703cb into master May 23, 2022

TravisEz13 deleted the TravisEz13-patch-8 branch May 23, 2022 17:46

TravisEz13 added the Backport-7.2.x-Consider label May 23, 2022

adityapatwardhan added Backport-7.2.x-Approved and removed Backport-7.2.x-Consider labels May 24, 2022

TravisEz13 added a commit to TravisEz13/PowerShell that referenced this pull request May 24, 2022

Fix mariner mappings (PowerShell#17413)

6806cac

# Conflicts: # tools/packages.microsoft.com/mapping.json

TravisEz13 added a commit that referenced this pull request May 31, 2022

Fix mariner mappings (#17413)

5c804e2

TravisEz13 added Backport-7.2.x-Done and removed Backport-7.2.x-Approved labels May 31, 2022

TravisEz13 mentioned this pull request Jun 7, 2022

Backport test fixes for 7.2 #17494

Merged

22 tasks

adityapatwardhan added the CL-BuildPackaging Indicates that a PR should be marked as a build or packaging change in the Change Log label Jun 16, 2022

TravisEz13 mentioned this pull request Apr 16, 2024

WIP: add more detail to suspicious scriptblock logging #21475

Closed

TravisEz13 mentioned this pull request Jul 9, 2024

Add script to update SDK for release branches #24034

Merged

Conversation

TravisEz13 commented May 23, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

PR Summary

PR Context

PR Checklist

Uh oh!

pull-request-quantifier-deprecated bot commented May 23, 2022

What can I do to optimize my changes

How to interpret the change counts in git diff output

Uh oh!

TravisEz13 commented May 23, 2022

Uh oh!

github-actions bot commented May 23, 2022 • edited by unfurl-links bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented May 23, 2022

Uh oh!

adityapatwardhan commented May 24, 2022

Uh oh!

github-actions bot commented May 24, 2022 • edited by unfurl-links bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented May 24, 2022

Uh oh!

TravisEz13 commented May 31, 2022

Uh oh!

github-actions bot commented May 31, 2022 • edited by unfurl-links bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented May 31, 2022

Uh oh!

TravisEz13 commented May 31, 2022

Uh oh!

ghost commented Jun 21, 2022

Uh oh!

ghost commented Jun 22, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

TravisEz13 commented May 23, 2022 •

edited

Loading

github-actions bot commented May 23, 2022 •

edited by unfurl-links bot

Loading

github-actions bot commented May 24, 2022 •

edited by unfurl-links bot

Loading

github-actions bot commented May 31, 2022 •

edited by unfurl-links bot

Loading