🔧 [CI]: Update conditional checks to incorporate Skip settings for TestResults and CodeCoverage

MariusStorhaug · MariusStorhaug · commit 8a4953c7e12d · 2025-03-26T08:22:24.000+01:00
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -171,7 +171,7 @@ jobs:
       WorkingDirectory: ${{ inputs.WorkingDirectory }}
 
   Get-TestResults:
-    if: needs.Get-Settings.result == 'success' && (needs.Get-Settings.outputs.SourceCodeTestSuites != '[]' || needs.Get-Settings.outputs.PSModuleTestSuites != '[]' || needs.Get-Settings.outputs.ModuleTestSuites != '[]') && (always() && !cancelled())
+    if: needs.Get-Settings.result == 'success' && fromJson(needs.Get-Settings.outputs.Settings).Test.TestResults.Skip != 'true' && (needs.Get-Settings.outputs.SourceCodeTestSuites != '[]' || needs.Get-Settings.outputs.PSModuleTestSuites != '[]' || needs.Get-Settings.outputs.ModuleTestSuites != '[]') && (always() && !cancelled())
     needs:
       - Get-Settings
       - Test-SourceCode
@@ -189,7 +189,7 @@ jobs:
       Version: ${{ inputs.Version }}
 
   Get-CodeCoverage:
-    if: needs.Get-Settings.result == 'success' && (needs.Get-Settings.outputs.PSModuleTestSuites != '[]' || needs.Get-Settings.outputs.ModuleTestSuites != '[]') && (always() && !cancelled())
+    if: needs.Get-Settings.result == 'success' && fromJson(needs.Get-Settings.outputs.Settings).Test.CodeCoverage.Skip != 'true' && (needs.Get-Settings.outputs.PSModuleTestSuites != '[]' || needs.Get-Settings.outputs.ModuleTestSuites != '[]') && (always() && !cancelled())
     needs:
       - Get-Settings
       - Test-Module
diff --git a/.github/workflows/Get-Settings.yml b/.github/workflows/Get-Settings.yml
@@ -173,6 +173,9 @@ jobs:
                             Skip = $settings.Test.Module.Windows.Skip ?? $false
                         }
                     }
+                    TestResults = [pscustomobject]@{
+                        Skip = $settings.Test.TestResults.Skip ?? $false
+                    }
                     CodeCoverage = [pscustomobject]@{
                       Skip = $settings.Test.CodeCoverage.Skip ?? $false
                       PercentTarget = $settings.Test.CodeCoverage.PercentTarget ?? 0
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -171,7 +171,7 @@ jobs:
       WorkingDirectory: ${{ inputs.WorkingDirectory }}
 
   Get-TestResults:
-    if: needs.Get-Settings.result == 'success' && (needs.Get-Settings.outputs.SourceCodeTestSuites != '[]' || needs.Get-Settings.outputs.PSModuleTestSuites != '[]' || needs.Get-Settings.outputs.ModuleTestSuites != '[]') && (always() && !cancelled())
+    if: needs.Get-Settings.result == 'success' && fromJson(needs.Get-Settings.outputs.Settings).Test.TestResults.Skip != 'true' && (needs.Get-Settings.outputs.SourceCodeTestSuites != '[]' || needs.Get-Settings.outputs.PSModuleTestSuites != '[]' || needs.Get-Settings.outputs.ModuleTestSuites != '[]') && (always() && !cancelled())
     needs:
       - Get-Settings
       - Test-SourceCode
@@ -189,7 +189,7 @@ jobs:
       Version: ${{ inputs.Version }}
 
   Get-CodeCoverage:
-    if: needs.Get-Settings.result == 'success' && (needs.Get-Settings.outputs.PSModuleTestSuites != '[]' || needs.Get-Settings.outputs.ModuleTestSuites != '[]') && (always() && !cancelled())
+    if: needs.Get-Settings.result == 'success' && fromJson(needs.Get-Settings.outputs.Settings).Test.CodeCoverage.Skip != 'true' && (needs.Get-Settings.outputs.PSModuleTestSuites != '[]' || needs.Get-Settings.outputs.ModuleTestSuites != '[]') && (always() && !cancelled())
     needs:
       - Get-Settings
       - Test-Module

Original file line number	Diff line number	Diff line change
`@@ -173,6 +173,9 @@ jobs:`
`173`	`173`	`Skip = $settings.Test.Module.Windows.Skip ?? $false`
`174`	`174`	`}`
`175`	`175`	`}`
	`176`	`+ TestResults = [pscustomobject]@{`
	`177`	`+ Skip = $settings.Test.TestResults.Skip ?? $false`
	`178`	`+ }`
`176`	`179`	`CodeCoverage = [pscustomobject]@{`
`177`	`180`	`Skip = $settings.Test.CodeCoverage.Skip ?? $false`
`178`	`181`	`PercentTarget = $settings.Test.CodeCoverage.PercentTarget ?? 0`