Move matrix strategy into Test-ModuleLocal workflow and update callin…

…g workflows

Co-authored-by: MariusStorhaug <17722253+MariusStorhaug@users.noreply.github.com>

.github/workflows/CI.yml

@@ -181,17 +181,10 @@ jobs:
     needs:
       - Build-Module
       - Get-Settings
-    strategy:
-      fail-fast: false
-      matrix:
-        include: ${{ fromJson(needs.Get-Settings.outputs.ModuleTestSuites) }}
     uses: ./.github/workflows/Test-ModuleLocal.yml
     secrets: inherit
     with:
-      RunsOn: ${{ matrix.RunsOn }}
-      OS: ${{ matrix.OSName }}
-      TestPath: ${{ matrix.TestPath }}
-      TestName: ${{ matrix.TestName }}
+      ModuleTestSuites: ${{ needs.Get-Settings.outputs.ModuleTestSuites }}
       Name: ${{ fromJson(needs.Get-Settings.outputs.Settings).Name }}
       Debug: ${{ inputs.Debug }}
       Prerelease: ${{ inputs.Prerelease }}

.github/workflows/Test-ModuleLocal.yml

@@ -25,28 +25,14 @@
         description: The classic personal access token for running tests.
         required: false
     inputs:
-      RunsOn:
+      ModuleTestSuites:
         type: string
-        description: The type of runner to use for the job.
-        required: true
-      OS:
-        type: string
-        description: The operating system name.
+        description: JSON array of module test suites to run (from Get-Settings output).
         required: true
       Name:
         type: string
         description: The name of the module to process. Scripts default to the repository name if nothing is specified.
         required: false
-      TestPath:
-        type: string
-        description: The path to the tests folder.
-        required: false
-        default: tests
-      TestName:
-        type: string
-        description: The path to the tests folder.
-        required: false
-        default: tests
       Debug:
         type: boolean
         description: Enable debug output.
@@ -85,10 +71,10 @@
         uses: actions/checkout@v5
 
       - name: Install-PSModuleHelpers
         uses: PSModule/Install-PSModuleHelpers@v1
 
       - name: Run BeforeAll Setup Scripts
         uses: PSModule/GitHub-Script@v1
         env:
           TEST_APP_ENT_CLIENT_ID: ${{ secrets.TEST_APP_ENT_CLIENT_ID }}
           TEST_APP_ENT_PRIVATE_KEY: ${{ secrets.TEST_APP_ENT_PRIVATE_KEY }}
@@ -169,10 +155,14 @@
             }
 
   Test-ModuleLocal:
-    name: Test-${{ inputs.TestName }} (${{ inputs.RunsOn }})
-    runs-on: ${{ inputs.RunsOn }}
+    name: Test-${{ matrix.TestName }} (${{ matrix.OSName }})
+    runs-on: ${{ matrix.RunsOn }}
     needs:
       - BeforeAll-ModuleLocal
+    strategy:
+      fail-fast: false
+      matrix:
+        include: ${{ fromJson(inputs.ModuleTestSuites) }}
     steps:
       - name: Checkout Code
         uses: actions/checkout@v5
@@ -213,14 +203,14 @@
           Prerelease: ${{ inputs.Prerelease }}
           Verbose: ${{ inputs.Verbose }}
           Version: ${{ inputs.Version }}
-          TestResult_TestSuiteName: ${{ inputs.TestName }}-${{ inputs.OS }}
+          TestResult_TestSuiteName: ${{ matrix.TestName }}-${{ matrix.OSName }}
           TestResult_Enabled: true
           CodeCoverage_Enabled: true
           Output_Verbosity: Detailed
           CodeCoverage_OutputFormat: JaCoCo
           CodeCoverage_CoveragePercentTarget: 0
           Filter_ExcludeTag: Flaky
-          Path: ${{ inputs.TestPath }}
+          Path: ${{ matrix.TestPath }}
           Run_Path: ${{ steps.import-module.outputs.path }}
           WorkingDirectory: ${{ inputs.WorkingDirectory }}
           Prescript: | # This is to speed up module loading in Pester.
@@ -238,11 +228,11 @@
         uses: actions/checkout@v5
 
       - name: Install-PSModuleHelpers
         uses: PSModule/Install-PSModuleHelpers@v1
 
       - name: Run AfterAll Teardown Scripts
         if: always()
         uses: PSModule/GitHub-Script@v1
         env:
           TEST_APP_ENT_CLIENT_ID: ${{ secrets.TEST_APP_ENT_CLIENT_ID }}
           TEST_APP_ENT_PRIVATE_KEY: ${{ secrets.TEST_APP_ENT_PRIVATE_KEY }}

.github/workflows/workflow.yml

@@ -183,17 +183,10 @@ jobs:
     needs:
       - Build-Module
       - Get-Settings
-    strategy:
-      fail-fast: false
-      matrix:
-        include: ${{ fromJson(needs.Get-Settings.outputs.ModuleTestSuites) }}
     uses: ./.github/workflows/Test-ModuleLocal.yml
     secrets: inherit
     with:
-      RunsOn: ${{ matrix.RunsOn }}
-      OS: ${{ matrix.OSName }}
-      TestPath: ${{ matrix.TestPath }}
-      TestName: ${{ matrix.TestName }}
+      ModuleTestSuites: ${{ needs.Get-Settings.outputs.ModuleTestSuites }}
       Name: ${{ fromJson(needs.Get-Settings.outputs.Settings).Name }}
       Debug: ${{ inputs.Debug }}
       Prerelease: ${{ inputs.Prerelease }}