Skip to content

Commit e10bb3c

Browse files
MariusStorhaugMariusStorhaug
committed
🔧 [CI]: Simplify conditional checks for Skip settings in TestResults and CodeCoverage
1 parent 8b02c68 commit e10bb3c

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

‎.github/workflows/CI.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ jobs:
171171
WorkingDirectory: ${{ inputs.WorkingDirectory }}
172172

173173
Get-TestResults:
174-
if: needs.Get-Settings.result == 'success' && fromJson(needs.Get-Settings.outputs.Settings).Test.TestResults.Skip == 'false' && (needs.Get-Settings.outputs.SourceCodeTestSuites != '[]' || needs.Get-Settings.outputs.PSModuleTestSuites != '[]' || needs.Get-Settings.outputs.ModuleTestSuites != '[]') && (always() && !cancelled())
174+
if: needs.Get-Settings.result == 'success' && !fromJson(needs.Get-Settings.outputs.Settings).Test.TestResults.Skip && (needs.Get-Settings.outputs.SourceCodeTestSuites != '[]' || needs.Get-Settings.outputs.PSModuleTestSuites != '[]' || needs.Get-Settings.outputs.ModuleTestSuites != '[]') && (always() && !cancelled())
175175
needs:
176176
- Get-Settings
177177
- Test-SourceCode
@@ -189,7 +189,7 @@ jobs:
189189
Version: ${{ inputs.Version }}
190190

191191
Get-CodeCoverage:
192-
if: needs.Get-Settings.result == 'success' && fromJson(needs.Get-Settings.outputs.Settings).Test.CodeCoverage.Skip == 'false' && (needs.Get-Settings.outputs.PSModuleTestSuites != '[]' || needs.Get-Settings.outputs.ModuleTestSuites != '[]') && (always() && !cancelled())
192+
if: needs.Get-Settings.result == 'success' && !fromJson(needs.Get-Settings.outputs.Settings).Test.CodeCoverage.Skip && (needs.Get-Settings.outputs.PSModuleTestSuites != '[]' || needs.Get-Settings.outputs.ModuleTestSuites != '[]') && (always() && !cancelled())
193193
needs:
194194
- Get-Settings
195195
- Test-Module

‎.github/workflows/workflow.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ jobs:
171171
WorkingDirectory: ${{ inputs.WorkingDirectory }}
172172

173173
Get-TestResults:
174-
if: needs.Get-Settings.result == 'success' && fromJson(needs.Get-Settings.outputs.Settings).Test.TestResults.Skip == 'false' && (needs.Get-Settings.outputs.SourceCodeTestSuites != '[]' || needs.Get-Settings.outputs.PSModuleTestSuites != '[]' || needs.Get-Settings.outputs.ModuleTestSuites != '[]') && (always() && !cancelled())
174+
if: needs.Get-Settings.result == 'success' && !fromJson(needs.Get-Settings.outputs.Settings).Test.TestResults.Skip && (needs.Get-Settings.outputs.SourceCodeTestSuites != '[]' || needs.Get-Settings.outputs.PSModuleTestSuites != '[]' || needs.Get-Settings.outputs.ModuleTestSuites != '[]') && (always() && !cancelled())
175175
needs:
176176
- Get-Settings
177177
- Test-SourceCode
@@ -189,7 +189,7 @@ jobs:
189189
Version: ${{ inputs.Version }}
190190

191191
Get-CodeCoverage:
192-
if: needs.Get-Settings.result == 'success' && fromJson(needs.Get-Settings.outputs.Settings).Test.CodeCoverage.Skip == 'false' && (needs.Get-Settings.outputs.PSModuleTestSuites != '[]' || needs.Get-Settings.outputs.ModuleTestSuites != '[]') && (always() && !cancelled())
192+
if: needs.Get-Settings.result == 'success' && !fromJson(needs.Get-Settings.outputs.Settings).Test.CodeCoverage.Skip && (needs.Get-Settings.outputs.PSModuleTestSuites != '[]' || needs.Get-Settings.outputs.ModuleTestSuites != '[]') && (always() && !cancelled())
193193
needs:
194194
- Get-Settings
195195
- Test-Module

0 commit comments

Comments
 (0)