Skip to content

Commit cca4a29

Browse files
feat: refactor variable assignments and enhance settings logging structure
1 parent 772df0d commit cca4a29

1 file changed

Lines changed: 31 additions & 25 deletions

File tree

scripts/main.ps1

Lines changed: 31 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
'powershell-yaml', 'Hashtable' | Install-PSResource -Repository PSGallery -TrustRepository -Reinstall
22

3-
$SettingsPath = $PSMODULE_GET_SETTINGS_INPUT_SettingsPath
4-
$Debug = $PSMODULE_GET_SETTINGS_INPUT_Debug
5-
$Verbose = $PSMODULE_GET_SETTINGS_INPUT_Verbose
6-
$Version = $PSMODULE_GET_SETTINGS_INPUT_Version
7-
$Prerelease = $PSMODULE_GET_SETTINGS_INPUT_Prerelease
8-
$WorkingDirectory = $PSMODULE_GET_SETTINGS_INPUT_WorkingDirectory
3+
$settingsPath = $env:PSMODULE_GET_SETTINGS_INPUT_SettingsPath
4+
$debug = $env:PSMODULE_GET_SETTINGS_INPUT_Debug
5+
$verbose = $env:PSMODULE_GET_SETTINGS_INPUT_Verbose
6+
$version = $env:PSMODULE_GET_SETTINGS_INPUT_Version
7+
$prerelease = $env:PSMODULE_GET_SETTINGS_INPUT_Prerelease
8+
$workingDirectory = $env:PSMODULE_GET_SETTINGS_INPUT_WorkingDirectory
99

1010
LogGroup 'Inputs' {
1111
[pscustomobject]@{
1212
PWD = (Get-Location).Path
13-
Name = $inputName
1413
SettingsPath = $settingsPath
1514
} | Format-List | Out-String
1615
}
@@ -46,14 +45,11 @@ if (![string]::IsNullOrEmpty($settingsPath) -and (Test-Path -Path $settingsPath)
4645

4746
LogGroup 'Name' {
4847
[pscustomobject]@{
49-
InputName = $inputName
5048
SettingsName = $settings.Name
5149
RepositoryName = $env:GITHUB_REPOSITORY_NAME
5250
} | Format-List | Out-String
5351

54-
if (![string]::IsNullOrEmpty($inputName)) {
55-
$name = $inputName
56-
} elseif (![string]::IsNullOrEmpty($settings.Name)) {
52+
if (![string]::IsNullOrEmpty($settings.Name)) {
5753
$name = $settings.Name
5854
} else {
5955
$name = $env:GITHUB_REPOSITORY_NAME
@@ -155,6 +151,14 @@ $settings = [pscustomobject]@{
155151
}
156152
}
157153

154+
# Add input properties to settings
155+
$settings | Add-Member -MemberType NoteProperty -Name SettingsPath -Value $settingsPath
156+
$settings | Add-Member -MemberType NoteProperty -Name Debug -Value $debug
157+
$settings | Add-Member -MemberType NoteProperty -Name Verbose -Value $verbose
158+
$settings | Add-Member -MemberType NoteProperty -Name Version -Value $version
159+
$settings | Add-Member -MemberType NoteProperty -Name Prerelease -Value $prerelease
160+
$settings | Add-Member -MemberType NoteProperty -Name WorkingDirectory -Value $workingDirectory
161+
158162
# Calculate job run conditions
159163
LogGroup 'Calculate Job Run Conditions:' {
160164
# Common conditions
@@ -323,20 +327,22 @@ LogGroup 'Calculate Job Run Conditions:' {
323327
})
324328

325329
Write-Host 'Job Run Conditions:'
326-
Write-Host " LintRepository: $($settings.Run.LintRepository)"
327-
Write-Host " BuildModule: $($settings.Run.BuildModule)"
328-
Write-Host " TestSourceCode: $($settings.Run.TestSourceCode)"
329-
Write-Host " LintSourceCode: $($settings.Run.LintSourceCode)"
330-
Write-Host " TestModule: $($settings.Run.TestModule)"
331-
Write-Host " BeforeAllModuleLocal: $($settings.Run.BeforeAllModuleLocal)"
332-
Write-Host " TestModuleLocal: $($settings.Run.TestModuleLocal)"
333-
Write-Host " AfterAllModuleLocal: $($settings.Run.AfterAllModuleLocal)"
334-
Write-Host " GetTestResults: $($settings.Run.GetTestResults)"
335-
Write-Host " GetCodeCoverage: $($settings.Run.GetCodeCoverage)"
336-
Write-Host " PublishModule: $($settings.Run.PublishModule)"
337-
Write-Host " BuildDocs: $($settings.Run.BuildDocs)"
338-
Write-Host " BuildSite: $($settings.Run.BuildSite)"
339-
Write-Host " PublishSite: $($settings.Run.PublishSite)"
330+
[pscustomobject]@{
331+
LintRepository = $settings.Run.LintRepository
332+
BuildModule = $settings.Run.BuildModule
333+
TestSourceCode = $settings.Run.TestSourceCode
334+
LintSourceCode = $settings.Run.LintSourceCode
335+
TestModule = $settings.Run.TestModule
336+
BeforeAllModuleLocal = $settings.Run.BeforeAllModuleLocal
337+
TestModuleLocal = $settings.Run.TestModuleLocal
338+
AfterAllModuleLocal = $settings.Run.AfterAllModuleLocal
339+
GetTestResults = $settings.Run.GetTestResults
340+
GetCodeCoverage = $settings.Run.GetCodeCoverage
341+
PublishModule = $settings.Run.PublishModule
342+
BuildDocs = $settings.Run.BuildDocs
343+
BuildSite = $settings.Run.BuildSite
344+
PublishSite = $settings.Run.PublishSite
345+
} | Format-List | Out-String
340346
}
341347

342348
LogGroup 'Final settings' {

0 commit comments

Comments
 (0)