-
Notifications
You must be signed in to change notification settings - Fork 8.1k
[release/v7.6] Fix template path for rebuild branch check in package.yml #26560
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
[release/v7.6] Fix template path for rebuild branch check in package.yml #26560
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull request overview
This PR attempts to backport #26425 from the main branch to release/v7.6 to fix Windows packaging pipeline failures by correcting the template path reference for rebuild-branch-check.yml. However, the backport has multiple critical issues due to incomplete merge conflict resolution.
Key Issues:
- The backport adds a reference to
rebuild-branch-check.ymltemplate that doesn't exist in the release/v7.6 branch, which will cause pipeline failures - Merge conflict resolution introduced duplicate parameter definitions and invalid parameter usage
- The PR description states it fixes pipeline failures, but the current state would introduce new failures
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| @@ -54,6 +54,10 @@ jobs: | |||
| - template: cloneToOfficialPath.yml | |||
| parameters: | |||
| nativePathRoot: '$(Agent.TempDirectory)' | |||
| nativePathRoot: '$(Agent.TempDirectory)' | |||
| ob_restore_phase: false | |||
Copilot
AI
Dec 2, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Invalid parameter passed to template. The ob_restore_phase: false parameter is being passed to the cloneToOfficialPath.yml template, but this template doesn't accept an ob_restore_phase parameter. Looking at the template definition (.pipelines/templates/cloneToOfficialPath.yml), it only accepts a nativePathRoot parameter and has ob_restore_phase: true hardcoded in its own env section.
Remove line 58, as ob_restore_phase should not be passed as a template parameter here.
| ob_restore_phase: false |
8ed4256 to
a31f196
Compare
a31f196 to
88d7417
Compare
Backport of #26425 to release/v7.6
Triggered by @adityapatwardhan on behalf of @TravisEz13
Original CL Label: CL-BuildPackaging
/cc @PowerShell/powershell-maintainers
Impact
REQUIRED: Choose either Tooling Impact or Customer Impact (or both). At least one checkbox must be selected.
Tooling Impact
Fixes Windows packaging pipeline failures on release/v7.6 by correcting template path reference. Without this fix, the packaging pipeline fails with 'template not found' errors, preventing successful Windows package builds for the v7.6 release.
Customer Impact
Regression
REQUIRED: Check exactly one box.
This is not a regression.
Testing
Original PR fixed pipeline failures on main branch. Backport verified by:
The fix resolves the pipeline error 'File /.pipelines/templates/packaging/windows/rebuild-branch-check.yml not found' by using the correct absolute path.
Risk
REQUIRED: Check exactly one box.
High risk due to changes in build pipeline, but necessary to maintain build health on release branch. Not taking this change creates technical debt and makes future pipeline updates difficult to backport. The change has been validated in master for 3 weeks without issues.
Merge Conflicts
The file
.pipelines/templates/windows-package-build.ymlhad conflicts during cherry-pick:Conflict: The v7.6 release branch was missing the
rebuild-branch-check.ymltemplate reference that exists in main.Resolution: Added the template reference with the correct absolute path
/.pipelines/templates/rebuild-branch-check.yml@selfand the requiredob_restore_phase: falseparameter. Adapted the change to fit the v7.6 file structure (different file name than main branch).