Move cgmanifest generation to daily#17258
Conversation
4e7489b to
7d026b2
Compare
|
This PR has Quantification details
Why proper sizing of changes matters
Optimal pull request sizes drive a better predictable PR flow as they strike a
What can I do to optimize my changes
How to interpret the change counts in git diff output
Was this comment helpful? 👍 :ok_hand: :thumbsdown: (Email) |
|
🎉 Handy links: |
|
/backport to release/v7.0.12 |
|
/backport to release/v7.2.5 |
|
Started backporting to release/v7.0.12: https://github.com/PowerShell/PowerShell/actions/runs/2380447110
|
|
Started backporting to release/v7.2.5: https://github.com/PowerShell/PowerShell/actions/runs/2380447852
|
|
@adityapatwardhan backporting to release/v7.0.12 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Move cgmanifest generation to daily
Using index info to reconstruct a base tree...
A .github/workflows/daily.yml
M .github/workflows/update-cgmanifest.yml
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): .github/workflows/update-cgmanifest.yml deleted in Move cgmanifest generation to daily and modified in HEAD. Version HEAD of .github/workflows/update-cgmanifest.yml left in tree.
CONFLICT (modify/delete): .github/workflows/daily.yml deleted in HEAD and modified in Move cgmanifest generation to daily. Version Move cgmanifest generation to daily of .github/workflows/daily.yml left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Move cgmanifest generation to daily
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! |
|
@adityapatwardhan an error occurred while backporting to release/v7.2.5, please check the run log for details! The process '/usr/bin/git' failed with exit code 1 |
* Move cgmanifest generation to daily * fix PR title
|
backported to 7.2 30aa6c7 |
|
🎉 Handy links: |
|
/backport to release/v7.0.12 |
|
Not taking this for 7.0.12 as the branch in hardcoded to master. We will take this when it can be changed to a release branch. |
* Move cgmanifest generation to daily * fix PR title
PR Summary
Move
cgmanifestgeneration to dailyPR Context
Having the functional and cgmanifest change the same PR interferes with back-port
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).