Skip to content

Commit 5dc37f8

Browse files
refactor: simplify Run object creation and logging in main.ps1
1 parent 6bfdd34 commit 5dc37f8

1 file changed

Lines changed: 22 additions & 39 deletions

File tree

scripts/main.ps1

Lines changed: 22 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -372,47 +372,30 @@ if ($settings.Test.Skip) {
372372
# Calculate job-specific conditions and add to settings
373373
LogGroup 'Calculate Job Run Conditions:' {
374374
# Create Run object with all job-specific conditions
375-
$settings | Add-Member -MemberType NoteProperty -Name Run -Value ([pscustomobject]@{
376-
LintRepository = $isOpenOrUpdatedPR -and (-not $settings.Linter.Skip)
377-
BuildModule = $isNotAbandonedPR -and (-not $settings.Build.Module.Skip)
378-
TestSourceCode = $isNotAbandonedPR -and ($null -ne $settings.TestSuites.SourceCode)
379-
LintSourceCode = $isNotAbandonedPR -and ($null -ne $settings.TestSuites.SourceCode)
380-
TestModule = $isNotAbandonedPR -and ($null -ne $settings.TestSuites.PSModule)
381-
BeforeAllModuleLocal = $isNotAbandonedPR -and ($null -ne $settings.TestSuites.Module)
382-
TestModuleLocal = $isNotAbandonedPR -and ($null -ne $settings.TestSuites.Module)
383-
AfterAllModuleLocal = $true # Always runs if Test-ModuleLocal was not skipped
384-
GetTestResults = $isNotAbandonedPR -and (-not $settings.Test.TestResults.Skip) -and (
385-
($null -ne $settings.TestSuites.SourceCode) -or ($null -ne $settings.TestSuites.PSModule) -or ($null -ne $settings.TestSuites.Module)
386-
)
387-
GetCodeCoverage = $isNotAbandonedPR -and (-not $settings.Test.CodeCoverage.Skip) -and (
388-
($null -ne $settings.TestSuites.PSModule) -or ($null -ne $settings.TestSuites.Module)
389-
)
390-
PublishModule = $isPR -and (
391-
$isAbandonedPR -or
392-
($isOpenOrUpdatedPR -or $isMergedPR)
393-
)
394-
BuildDocs = $isNotAbandonedPR -and (-not $settings.Build.Docs.Skip)
395-
BuildSite = $isNotAbandonedPR -and (-not $settings.Build.Site.Skip)
396-
PublishSite = $isMergedPR
397-
})
375+
$run = [pscustomobject]@{
376+
LintRepository = $isOpenOrUpdatedPR -and (-not $settings.Linter.Skip)
377+
BuildModule = $isNotAbandonedPR -and (-not $settings.Build.Module.Skip)
378+
TestSourceCode = $isNotAbandonedPR -and ($null -ne $settings.TestSuites.SourceCode)
379+
LintSourceCode = $isNotAbandonedPR -and ($null -ne $settings.TestSuites.SourceCode)
380+
TestModule = $isNotAbandonedPR -and ($null -ne $settings.TestSuites.PSModule)
381+
BeforeAllModuleLocal = $isNotAbandonedPR -and ($null -ne $settings.TestSuites.Module)
382+
TestModuleLocal = $isNotAbandonedPR -and ($null -ne $settings.TestSuites.Module)
383+
AfterAllModuleLocal = $true # Always runs if Test-ModuleLocal was not skipped
384+
GetTestResults = $isNotAbandonedPR -and (-not $settings.Test.TestResults.Skip) -and (
385+
($null -ne $settings.TestSuites.SourceCode) -or ($null -ne $settings.TestSuites.PSModule) -or ($null -ne $settings.TestSuites.Module)
386+
)
387+
GetCodeCoverage = $isNotAbandonedPR -and (-not $settings.Test.CodeCoverage.Skip) -and (
388+
($null -ne $settings.TestSuites.PSModule) -or ($null -ne $settings.TestSuites.Module)
389+
)
390+
PublishModule = $isPR -and ($isAbandonedPR -or ($isOpenOrUpdatedPR -or $isMergedPR))
391+
BuildDocs = $isNotAbandonedPR -and (-not $settings.Build.Docs.Skip)
392+
BuildSite = $isNotAbandonedPR -and (-not $settings.Build.Site.Skip)
393+
PublishSite = $isMergedPR
394+
}
395+
$settings | Add-Member -MemberType NoteProperty -Name Run -Value $run
398396

399397
Write-Host 'Job Run Conditions:'
400-
[pscustomobject]@{
401-
LintRepository = $settings.Run.LintRepository
402-
BuildModule = $settings.Run.BuildModule
403-
TestSourceCode = $settings.Run.TestSourceCode
404-
LintSourceCode = $settings.Run.LintSourceCode
405-
TestModule = $settings.Run.TestModule
406-
BeforeAllModuleLocal = $settings.Run.BeforeAllModuleLocal
407-
TestModuleLocal = $settings.Run.TestModuleLocal
408-
AfterAllModuleLocal = $settings.Run.AfterAllModuleLocal
409-
GetTestResults = $settings.Run.GetTestResults
410-
GetCodeCoverage = $settings.Run.GetCodeCoverage
411-
PublishModule = $settings.Run.PublishModule
412-
BuildDocs = $settings.Run.BuildDocs
413-
BuildSite = $settings.Run.BuildSite
414-
PublishSite = $settings.Run.PublishSite
415-
} | Format-List | Out-String
398+
$run | Format-List | Out-String
416399
}
417400

418401
LogGroup 'Final settings' {

0 commit comments

Comments
 (0)