Merge branch 'master' into justingrote/feature/webRequestLogging

Author: JustinGrote

.github/CODEOWNERS

@@ -10,8 +10,8 @@
 src/System.Management.Automation/security/wldpNativeMethods.cs @TravisEz13 @seeminglyscience
 
 # Area: CI Build
-.github/workflows    @PowerShell/powershell-maintainers
-.github/actions      @PowerShell/powershell-maintainers
+.github/workflows    @PowerShell/powershell-maintainers @jshigetomi
+.github/actions      @PowerShell/powershell-maintainers @jshigetomi 
 
 # Now, areas that should have paths or filters, although we might not have them defined
 # According to the docs, order here must be by precedence of the filter, with later rules overwritting
@@ -53,13 +53,13 @@ src/System.Management.Automation/engine/remoting    @daxian-dbw @TravisEz13
 
 # Areas: Build
 # Must be last
-*.config   @PowerShell/powershell-maintainers 
-*.props    @PowerShell/powershell-maintainers 
-*.yml      @PowerShell/powershell-maintainers 
-*.csproj   @PowerShell/powershell-maintainers 
-build.*    @PowerShell/powershell-maintainers 
-tools/     @PowerShell/powershell-maintainers 
-# docker/    @PowerShell/powershell-maintainers 
+*.config   @PowerShell/powershell-maintainers @jshigetomi
+*.props    @PowerShell/powershell-maintainers @jshigetomi
+*.yml      @PowerShell/powershell-maintainers @jshigetomi
+*.csproj   @PowerShell/powershell-maintainers @jshigetomi
+build.*    @PowerShell/powershell-maintainers @jshigetomi
+tools/     @PowerShell/powershell-maintainers @jshigetomi
+# docker/    @PowerShell/powershell-maintainers @jshigetomi
 
 # Area: Compliance
 tools/terms    @TravisEz13

.github/ISSUE_TEMPLATE/Distribution_Request.yaml

@@ -14,8 +14,7 @@
   - Use the present tense and imperative mood when describing your changes
 - [ ] [Summarized changes](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#pull-request---submission)
 - [ ] [Make sure all `.h`, `.cpp`, `.cs`, `.ps1` and `.psm1` files have the correct copyright header](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#pull-request---submission)
-- [ ] This PR is ready to merge and is not [Work in Progress](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#pull-request---work-in-progress).
-  - If the PR is work in progress, please add the prefix `WIP:` or `[ WIP ]` to the beginning of the title (the `WIP` bot will keep its status check at `Pending` while the prefix is present) and remove the prefix when the PR is ready.
+- [ ] This PR is ready to merge. If this PR is a work in progress, please open this as a [Draft Pull Request and mark it as Ready to Review when it is ready to merge](https://docs.github.com/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests#draft-pull-requests).
 - **[Breaking changes](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#making-breaking-changes)**
   - [ ] None
   - **OR**
@@ -25,21 +24,8 @@
   - [ ] Not Applicable
   - **OR**
   - [ ] [Documentation needed](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#pull-request---submission)
-        - [ ] Issue filed: <!-- Number/link of that issue here -->
+    - [ ] Issue filed: <!-- Number/link of that issue here -->
 - **Testing - New and feature**
   - [ ] N/A or can only be tested interactively
   - **OR**
   - [ ] [Make sure you've added a new test if existing tests do not effectively test the code changed](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#before-submitting)
-- **Tooling**
-  - [ ] I have considered the user experience from a tooling perspective and don't believe tooling will be impacted.
-  - **OR**
-  - [ ] I have considered the user experience from a tooling perspective and opened an issue in the relevant tool repository. This may include:
-    - [ ] Impact on [PowerShell Editor Services](https://github.com/PowerShell/PowerShellEditorServices) which is used in the [PowerShell extension](https://github.com/PowerShell/vscode-powershell) for VSCode
-        (which runs in a different PS Host).
-      - [ ] Issue filed: <!-- Number/link of that issue here -->
-    - [ ] Impact on Completions (both in the console and in editors) - one of PowerShell's most powerful features.
-      - [ ] Issue filed: <!-- Number/link of that issue here -->
-    - [ ] Impact on [PSScriptAnalyzer](https://github.com/PowerShell/PSScriptAnalyzer) (which provides linting & formatting in the editor extensions).
-      - [ ] Issue filed: <!-- Number/link of that issue here -->
-    - [ ] Impact on [EditorSyntax](https://github.com/PowerShell/EditorSyntax) (which provides syntax highlighting with in VSCode, GitHub, and many other editors).
-      - [ ] Issue filed: <!-- Number/link of that issue here -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,105 @@
+name: Path Filters
+description: 'Path Filters'
+inputs:
+  GITHUB_TOKEN:
+    description: 'GitHub token'
+    required: true
+outputs:
+  source:
+    description: 'Source code changes (composite of all changes)'
+    value: ${{ steps.filter.outputs.source }}
+  githubChanged:
+    description: 'GitHub workflow changes'
+    value: ${{ steps.filter.outputs.githubChanged }}
+  toolsChanged:
+    description: 'Tools changes'
+    value: ${{ steps.filter.outputs.toolsChanged }}
+  propsChanged:
+    description: 'Props changes'
+    value: ${{ steps.filter.outputs.propsChanged }}
+  testsChanged:
+    description: 'Tests changes'
+    value: ${{ steps.filter.outputs.testsChanged }}
+  mainSourceChanged:
+    description: 'Main source code changes (any changes in src/)'
+    value: ${{ steps.filter.outputs.mainSourceChanged }}
+  buildModuleChanged:
+    description: 'Build module changes'
+    value: ${{ steps.filter.outputs.buildModuleChanged }}
+runs:
+  using: composite
+  steps:
+    - name: Check if GitHubWorkflowChanges is present
+      id: filter
+      uses: actions/[email protected]
+      with:
+        github-token: ${{ inputs.GITHUB_TOKEN }}
+        script: |
+          console.log(`Event Name: ${context.eventName}`);
+
+          // Just say everything changed if this is not a PR
+          if (context.eventName !== 'pull_request') {
+            console.log('Not a pull request, setting all outputs to true');
+            core.setOutput('toolsChanged', true);
+            core.setOutput('githubChanged', true);
+            core.setOutput('propsChanged', true);
+            core.setOutput('testsChanged', true);
+            core.setOutput('mainSourceChanged', true);
+            core.setOutput('buildModuleChanged', true);
+            core.setOutput('source', true);
+            return;
+          }
+
+          console.log(`Getting files changed in PR #${context.issue.number}`);
+
+          // Fetch the list of files changed in the PR
+          let files = [];
+          let page = 1;
+          let fetchedFiles;
+          do {
+            fetchedFiles = await github.rest.pulls.listFiles({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: context.issue.number,
+              per_page: 100,
+              page: page++
+            });
+            files = files.concat(fetchedFiles.data);
+          } while (fetchedFiles.data.length > 0);
+
+          const actionsChanged = files.some(file => file.filename.startsWith('.github/actions'));
+          const workflowsChanged = files.some(file => file.filename.startsWith('.github/workflows'));
+          const githubChanged = actionsChanged || workflowsChanged;
+
+          const toolsCiPsm1Changed = files.some(file => file.filename.startsWith('tools/ci.psm1'));
+          const toolsBuildCommonChanged = files.some(file => file.filename.startsWith('tools/buildCommon/'));
+          const toolsChanged = toolsCiPsm1Changed || toolsBuildCommonChanged;
+
+          const propsChanged = files.some(file => file.filename.endsWith('.props'));
+
+          const testsChanged = files.some(file => file.filename.startsWith('test/powershell/') || file.filename.startsWith('test/tools/') || file.filename.startsWith('test/xUnit/'));
+
+          const mainSourceChanged = files.some(file => file.filename.startsWith('src/'));
+
+          const buildModuleChanged = files.some(file => file.filename.startsWith('build.psm1'));
+
+          const source = mainSourceChanged || toolsChanged || githubChanged || propsChanged || testsChanged;
+
+          core.setOutput('toolsChanged', toolsChanged);
+          core.setOutput('githubChanged', githubChanged);
+          core.setOutput('propsChanged', propsChanged);
+          core.setOutput('testsChanged', testsChanged);
+          core.setOutput('mainSourceChanged', mainSourceChanged);
+          core.setOutput('buildModuleChanged', buildModuleChanged);
+          core.setOutput('source', source);
+
+    - name: Capture outputs
+      run: |
+        Write-Verbose -Verbose "source: ${{ steps.filter.outputs.source }}"
+        Write-Verbose -Verbose "github: ${{ steps.filter.outputs.githubChanged }}"
+        Write-Verbose -Verbose "tools: ${{ steps.filter.outputs.toolsChanged }}"
+        Write-Verbose -Verbose "props: ${{ steps.filter.outputs.propsChanged }}"
+        Write-Verbose -Verbose "tests: ${{ steps.filter.outputs.testsChanged }}"
+        Write-Verbose -Verbose "mainSource: ${{ steps.filter.outputs.mainSourceChanged }}"
+        Write-Verbose -Verbose "buildModule: ${{ steps.filter.outputs.buildModuleChanged }}"
+      shell: pwsh

.github/actions/infrastructure/path-filters/action.yml

@@ -20,26 +20,39 @@ runs:
   steps:
   - name: Capture Environment
     if: success() || failure()
-    run: 'Get-ChildItem -Path env: | Out-String -width 9999 -Stream | write-Verbose -Verbose'
+    run: |-
+      Import-Module ./build.psm1
+      Write-LogGroupStart -Title 'Environment'
+      Get-ChildItem -Path env: | Out-String -width 9999 -Stream | write-Verbose -Verbose
+      Write-LogGroupEnd -Title 'Environment'
     shell: pwsh
+
   - name: Download Build Artifacts
     uses: actions/download-artifact@v4
     with:
       path: "${{ github.workspace }}"
+
   - name: Capture Artifacts Directory
     continue-on-error: true
-    run: Get-ChildItem "${{ github.workspace }}/build/*" -Recurse
+    run: |-
+      Import-Module ./build.psm1
+      Write-LogGroupStart -Title 'Artifacts Directory'
+      Get-ChildItem "${{ github.workspace }}/build/*" -Recurse
+      Write-LogGroupEnd -Title 'Artifacts Directory'
     shell: pwsh
-    
+
   - uses: actions/setup-dotnet@v4
     with:
       global-json-file: ./global.json
-      
+
   - name: Bootstrap
     shell: pwsh
     run: |-
+      Import-Module ./build.psm1
+      Write-LogGroupStart -Title 'Bootstrap'
       Import-Module ./tools/ci.psm1
       Invoke-CIInstall -SkipUser
+      Write-LogGroupEnd -Title 'Bootstrap'
 
   - name: Extract Files
     uses: actions/[email protected]
@@ -68,7 +81,11 @@ runs:
 
   - name: Capture Extracted Build ZIP
     continue-on-error: true
-    run: Get-ChildItem "${{ github.workspace }}/bins/*" -Recurse -ErrorAction SilentlyContinue
+    run: |-
+      Import-Module ./build.psm1
+      Write-LogGroupStart -Title 'Extracted Build ZIP'
+      Get-ChildItem "${{ github.workspace }}/bins/*" -Recurse -ErrorAction SilentlyContinue
+      Write-LogGroupEnd -Title 'Extracted Build ZIP'
     shell: pwsh
 
   - name: Test
@@ -84,7 +101,7 @@ runs:
       chmod a+x $pwshPath
       $options.Output = $pwshPath
       Set-PSOptions $options
-      Invoke-CITest -Purpose '${{ inputs.purpose }}' -TagSet '${{ inputs.tagSet }}' -TitlePrefix '${{ inputs.buildName }}' -OutputFormat JUnitXml
+      Invoke-CITest -Purpose '${{ inputs.purpose }}' -TagSet '${{ inputs.tagSet }}' -TitlePrefix '${{ inputs.buildName }}' -OutputFormat NUnitXml
     shell: pwsh
 
   - name: Convert, Publish, and Upload Pester Test Results

.github/actions/test/nix/action.yml

@@ -10,55 +10,18 @@ inputs:
     required: false
     default: "${{ runner.workspace }}/testResults"
     type: string
-  ctrfFolder:
-    required: false
-    default: ctrf
-    type: string
 
 runs:
   using: composite
   steps:
-  - name: Convert JUnit to CTRF
+  - name: Log Summary
     run: |-
-      Get-ChildItem -Path "${{ inputs.testResultsFolder }}/*.xml" -Recurse | ForEach-Object {
-        npx --yes junit-to-ctrf $_.FullName --output ./${{ inputs.ctrfFolder }}/$($_.BaseName).json --tool Pester
-      }
+      & "$env:GITHUB_ACTION_PATH/process-pester-results.ps1" -Name '${{ inputs.name }}' -TestResultsFolder '${{ inputs.testResultsFolder }}'
     shell: pwsh
 
-  # this task only takes / as directory separators
-  - name: Publish Test Report
-    uses: ctrf-io/github-test-reporter@v1
-    with:
-      report-path: './${{ inputs.ctrfFolder }}/*.json'
-      exit-on-fail: true
-      summary-report: true
-      test-report: false
-      test-list-report: false
-      failed-report: false
-      fail-rate-report: false
-      flaky-report: false
-      flaky-rate-report: false
-      failed-folded-report: true
-      previous-results-report: false
-      ai-report: true
-      skipped-report: false
-      suite-folded-report: false
-      suite-list-report: false
-      pull-request-report: false
-      commit-report: false
-      custom-report: false
-    if: always()
-
   - name: Upload testResults artifact
     if: always()
     uses: actions/upload-artifact@v4
     with:
       name: junit-pester-${{ inputs.name }}
       path: ${{ runner.workspace }}/testResults
-
-  - name: Upload ctrf artifact
-    if: always()
-    uses: actions/upload-artifact@v4
-    with:
-      name: ctrf-pester-${{ inputs.name }}
-      path: ${{ inputs.ctrfFolder }}