🩹 [CI]: Enhance Get-TestSuites workflow to include ModuleLocalTestSuites and improve test suite descriptions

MariusStorhaug · MariusStorhaug · commit e388e420de41 · 2025-03-11T16:14:47.000+01:00
diff --git a/.github/workflows/Get-TestSuites.yml b/.github/workflows/Get-TestSuites.yml
@@ -36,11 +36,14 @@ on:
 
     outputs:
       SourceCodeTestSuites:
-        description: Source Code test suites to run.
+        description: Source Code PSModule test suites to run.
         value: ${{ jobs.Get-TestSuites.outputs.SourceCodeTestSuites }}
       ModuleTestSuites:
-        description: Module test suites to run.
+        description: Module PSModule test suites to run.
         value: ${{ jobs.Get-TestSuites.outputs.ModuleTestSuites }}
+      ModuleLocalTestSuites:
+        description: Module local test suites to run.
+        value: ${{ jobs.Get-TestSuites.outputs.ModuleLocalTestSuites }}
 
 permissions:
   contents: read # to checkout the repo
@@ -52,6 +55,7 @@ jobs:
     outputs:
       SourceCodeTestSuites: ${{ fromJson(steps.Get-TestSuites.outputs.result).SourceCodeTestSuites }}
       ModuleTestSuites: ${{ fromJson(steps.Get-TestSuites.outputs.result).ModuleTestSuites }}
+      ModuleLocalTestSuites: ${{ fromJson(steps.Get-TestSuites.outputs.result).ModuleLocalTestSuites }}
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4
@@ -151,14 +155,30 @@ jobs:
                 -not ($skipTests -contains 'All' -or $skipTests -contains $_.OSName -or $skipTests -contains 'SourceCode')
             } | Select-Object -Property RunsOn, OSName -Unique
 
+            # Generate ModuleTestSuites (static tests)
+            $moduleTestSuites = $testSuites | Where-Object {
+                $_.TestName -match '\.(Configuration|Container)\.ps1$' -and
+                -not ($skipTests -contains 'All' -or $skipTests -contains $_.OSName -or $skipTests -contains 'Module')
+            }
+
+            # Generate ModuleLocalTestSuites (local tests)
+            $moduleLocalTestSuites = $testSuites | Where-Object {
+                $_.TestName -match '\.Tests\.ps1$' -and
+                -not ($skipTests -contains 'All' -or $skipTests -contains $_.OSName -or $skipTests -contains 'Module')
+            }
+
             # Display the generated matrices for verification.
             LogGroup 'Source Code Test Suites:' {
               $sourceCodeTestSuites | Format-Table -AutoSize | Out-String
             }
             LogGroup 'Module Test Suites:' {
-              $testSuites | Format-Table -AutoSize | Out-String
+              $moduleTestSuites | Format-Table -AutoSize | Out-String
+            }
+            LogGroup 'Module Local Test Suites:' {
+              $moduleLocalTestSuites | Format-Table -AutoSize | Out-String
             }
 
             # Pass the final objects to GitHub Actions output as JSON
             Set-GitHubOutput -Name SourceCodeTestSuites -Value ($sourceCodeTestSuites ?? '[]')
-            Set-GitHubOutput -Name ModuleTestSuites -Value ($testSuites ?? '[]')
+            Set-GitHubOutput -Name ModuleTestSuites -Value ($moduleTestSuites ?? '[]')
+            Set-GitHubOutput -Name ModuleLocalTestSuites -Value ($moduleLocalTestSuites ?? '[]')
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -99,7 +99,6 @@ jobs:
       RunsOn: ${{ matrix.RunsOn }}
       OS: ${{ matrix.OSName }}
       Name: ${{ inputs.Name }}
-      SkipTests: ${{ inputs.SkipTests }}
       Debug: ${{ inputs.Debug }}
       Prerelease: ${{ inputs.Prerelease }}
       Verbose: ${{ inputs.Verbose }}
@@ -130,7 +129,7 @@ jobs:
 
   Test-Module:
     name: Test-Module
-    if: ${{ needs.Build-Module.result == 'success' && !cancelled() && needs.Get-TestSuites.outputs.SourceCodeTestSuites != '[]' }}
+    if: ${{ needs.Build-Module.result == 'success' && !cancelled() && needs.Get-TestSuites.outputs.ModuleTestSuites != '[]' }}
     needs:
       - Build-Module
       - Get-TestSuites
@@ -144,7 +143,6 @@ jobs:
       RunsOn: ${{ matrix.RunsOn }}
       OS: ${{ matrix.OSName }}
       Name: ${{ inputs.Name }}
-      SkipTests: ${{ inputs.SkipTests }}
       Debug: ${{ inputs.Debug }}
       Prerelease: ${{ inputs.Prerelease }}
       Verbose: ${{ inputs.Verbose }}
@@ -153,21 +151,20 @@ jobs:
 
   Test-ModuleLocal:
     name: ${{ matrix.TestName }}
-    if: ${{ needs.Build-Module.result == 'success' && !cancelled() && needs.Get-TestSuites.outputs.ModuleTestSuites != '[]' }}
+    if: ${{ needs.Build-Module.result == 'success' && !cancelled() && needs.Get-TestSuites.outputs.ModuleLocalTestSuites != '[]' }}
     needs:
       - Build-Module
       - Get-TestSuites
     strategy:
       fail-fast: false
       matrix:
-        include: ${{ fromJson(needs.Get-TestSuites.outputs.ModuleTestSuites) }}
+        include: ${{ fromJson(needs.Get-TestSuites.outputs.ModuleLocalTestSuites) }}
     uses: ./.github/workflows/Test-ModuleLocal.yml
     secrets: inherit
     with:
       RunsOn: ${{ matrix.RunsOn }}
       OS: ${{ matrix.OSName }}
       Name: ${{ inputs.Name }}
-      SkipTests: ${{ inputs.SkipTests }}
       TestPath: ${{ matrix.TestPath }}
       TestName: ${{ matrix.TestName }}
       Debug: ${{ inputs.Debug }}
