Update to use windows-latest as the build agent image#16831
Merged
adityapatwardhan merged 11 commits intoPowerShell:masterfrom Feb 8, 2022
Merged
Update to use windows-latest as the build agent image#16831adityapatwardhan merged 11 commits intoPowerShell:masterfrom
windows-latest as the build agent image#16831adityapatwardhan merged 11 commits intoPowerShell:masterfrom
Conversation
daxian-dbw
requested review from
PaulHigin,
TravisEz13,
adityapatwardhan and
anmenaga
as code owners
PaulHigin
approved these changes
Feb 2, 2022
iSazonov
approved these changes
Feb 2, 2022
adityapatwardhan
approved these changes
Feb 2, 2022
TravisEz13
approved these changes
Feb 2, 2022
Member
|
There are 3 other files that need to be updated: windows-test.yml, windows-packaging.yml, PSGalleryToAzArtifiacts.yml |
adityapatwardhan
approved these changes
Feb 2, 2022
…bility-bugged WindowsPS buitin modules
PaulHigin
approved these changes
Feb 7, 2022
daxian-dbw
added
the
CL-BuildPackaging
PaulHigin
suggested changes
Feb 7, 2022
test/powershell/Modules/Microsoft.WSMan.Management/CredSSP.Tests.ps1
Outdated
Show resolved
Hide resolved
ghost
added
the
Waiting on Author
adityapatwardhan
approved these changes
Feb 8, 2022
|
🎉 Handy links: |
adityapatwardhan
added
BackPort-7.0.x-Consider
Review - Maintainer
Member
|
The test changes for CredSSP need to be back ported to 7.0 and 7.1. |
Member
|
/backport to release/v7.0.11 |
Contributor
|
Started backporting to release/v7.0.11: https://github.com/PowerShell/PowerShell/actions/runs/2271020053
|
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: Update to use 'windows-latest' as the build agent image
Using index info to reconstruct a base tree...
M .vsts-ci/templates/ci-build.yml
M .vsts-ci/windows-daily.yml
Falling back to patching base and 3-way merge...
Auto-merging .vsts-ci/windows-daily.yml
CONFLICT (content): Merge conflict in .vsts-ci/windows-daily.yml
Auto-merging .vsts-ci/templates/ci-build.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 Update to use 'windows-latest' as the build agent image
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: # .vsts-ci/windows-daily.yml
Member
|
🎉 Handy links: |
Member
|
/backport to release/v7.2.5 |
Contributor
|
Started backporting to release/v7.2.5: https://github.com/PowerShell/PowerShell/actions/runs/2374394809
|
1 task
adityapatwardhan
added
Backport-7.2.x-Approved
and removed
Backport-7.2.x-Consider
labels
adityapatwardhan
removed
the
Review - Maintainer
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
5 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
Update to use
windows-latestas the build agent image for CI, because the windows-2016 is being deprecated.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.