-
Notifications
You must be signed in to change notification settings - Fork 8.1k
Add mariner 1.0 amd64 package #17057
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
This reverts commit e79cf86.
|
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.2.5 |
|
Started backporting to release/v7.2.5: https://github.com/PowerShell/PowerShell/actions/runs/2374308271
|
|
@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: add mariner package
Using index info to reconstruct a base tree...
M tools/packaging/packaging.psm1
Falling back to patching base and 3-way merge...
Auto-merging tools/packaging/packaging.psm1
CONFLICT (content): Merge conflict in tools/packaging/packaging.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 add mariner package
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! |
* add mariner package * update signing * update template branch * Don't overwrite signed files * use nevercopy * update bom tests to support rpm * switch to new output mode param * more complex copy strategy * change mariner distribution name * Fix dependecies * add error details * fix variable name * fix all distribution * fix macos packaging error * add diags * fix macos * fix package name validation * check boms on ubuntu * pend tests if rpm2cpio doesn't exist * Revert "check boms on ubuntu" This reverts commit e79cf86. * use download task instead of azCopy * Use ubuntu again * filter symbol packages * fix rpm test * Get correct pshome * skip hash check on * Update tools/releaseBuild/azureDevOps/releaseBuild.yml # Conflicts: # tools/packaging/packaging.psm1
PR Summary
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).