[release/v7.6] Add merge conflict marker detection to linux-ci workflow and refactor existing actions to use reusable get-changed-files action #26530
Conversation
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
… existing actions to use reusable get-changed-files action (PowerShell#26350) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: TravisEz13 <10873629+TravisEz13@users.noreply.github.com> Co-authored-by: Travis Plunk <travis.plunk@microsoft.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Travis Plunk (HE/HIM) <tplunk@ntdev.microsoft.com>
TravisEz13
added
the
CL-Tools
Contributor
There was a problem hiding this comment.
Pull request overview
This backport PR adds merge conflict marker detection to the linux-ci workflow and introduces a new Install-CIPester function to standardize Pester module installation across CI jobs. The PR includes comprehensive test coverage for the new functionality and adds guidance documentation for PowerShell code organization and automatic variable naming conventions.
Key Changes:
- New
Test-MergeConflictMarkerfunction intools/ci.psm1to detect Git merge conflict markers - New
Install-CIPesterfunction to standardize Pester installation - New GitHub Actions composite action for merge conflict checking
- Infrastructure tests job added to linux-ci workflow
- Documentation files for PowerShell code organization and naming conventions
Reviewed changes
Copilot reviewed 10 out of 10 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
.github/workflows/linux-ci.yml |
Contains unresolved merge conflicts - Added merge_conflict_check and infrastructure_tests jobs with duplicate dependency entries |
tools/ci.psm1 |
Added Test-MergeConflictMarker and Install-CIPester functions for CI validation |
test/infrastructure/ciModule.Tests.ps1 |
Comprehensive Pester tests for new CI module functions |
.github/actions/infrastructure/merge-conflict-checker/action.yml |
New composite action for detecting merge conflict markers in PRs |
.github/actions/infrastructure/merge-conflict-checker/README.md |
Documentation for merge conflict checker action |
.github/actions/test/linux-packaging/action.yml |
Updated to use Install-CIPester for standardized Pester installation |
.github/workflows/macos-ci.yml |
Added Pester installation step using Install-CIPester |
.vsts-ci/templates/nanoserver.yml |
File removed |
.github/instructions/powershell-module-organization.instructions.md |
New documentation for PowerShell code organization guidelines |
.github/instructions/powershell-automatic-variables.instructions.md |
New documentation for PowerShell automatic variable naming conventions |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 10 out of 10 changed files in this pull request and generated 2 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
microsoft-github-policy-service
bot
added
the
Review - Needed
Contributor
|
This pull request has been automatically marked as Review Needed because it has been there has not been any activity for 7 days. |
daxian-dbw
approved these changes
Dec 5, 2025
Copilot AI
added a commit
that referenced
this pull request
Dec 5, 2025
Move linux_packaging job before ready_to_merge to fix the workflow validation error. Jobs must be defined before they are referenced in needs sections. Fixes #26530 Co-authored-by: adityapatwardhan <12820925+adityapatwardhan@users.noreply.github.com>
daxian-dbw
approved these changes
Dec 5, 2025
12 tasks
12 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Backport of #26350 to release/v7.6
Triggered by @TravisEz13 on behalf of @copilot-swe-agent
Original CL Label: CL-Tools
/cc @PowerShell/powershell-maintainers
Impact
REQUIRED: Choose either Tooling Impact or Customer Impact (or both). At least one checkbox must be selected.
Tooling Impact
Adds merge conflict marker detection to the linux-ci workflow to prevent accidental commits with unresolved merge conflict markers. Also refactors existing actions to use the reusable get-changed-files action for better maintainability.
Customer Impact
Regression
REQUIRED: Check exactly one box.
This is not a regression.
Testing
Verified by:
Risk
REQUIRED: Check exactly one box.
Medium risk: Adds new CI workflow jobs and GitHub Actions, but these are non-blocking checks that detect issues without preventing merges. Changes are isolated to workflow definitions and test infrastructure, with minimal impact on production code.
Merge Conflicts
File:
.github/workflows/linux-ci.ymlready_to_mergejobmerge_conflict_checkandinfrastructure_testsjobs from the backport to the release branch's existinglinux_packagingjob