Skip to content

Commit eba4cb0

Browse files
Robert Holtrjmholt
Robert Holt
authored andcommitted
Fix release name bug
1 parent 3ac02f8 commit eba4cb0

File tree

1 file changed

+32
-7
lines changed

1 file changed

+32
-7
lines changed

tools/changelog/updateChangelog.ps1

Lines changed: 32 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ param(
1414

1515
[Parameter(Mandatory)]
1616
[string]
17-
$SinceRef,
17+
$PSExtensionSinceRef,
18+
19+
[Parameter(Mandatory)]
20+
[string]
21+
$PsesSinceRef,
1822

1923
[Parameter()]
2024
[version]
@@ -34,7 +38,11 @@ param(
3438

3539
[Parameter()]
3640
[string]
37-
$UntilRef = 'HEAD',
41+
$PSExtensionUntilRef = 'HEAD',
42+
43+
[Parameter()]
44+
[string]
45+
$PsesUntilRef = 'HEAD',
3846

3947
[Parameter()]
4048
[string]
@@ -163,6 +171,14 @@ $branchName = "changelog-$ReleaseName"
163171

164172
#region PSES Changelog
165173

174+
$psesGetCommitParams = @{
175+
SinceRef = $PsesSinceRef
176+
UntilRef = $PsesUntilRef
177+
GitHubToken = $GitHubToken
178+
RepositoryPath = $PsesRepositoryPath
179+
Verbose = $VerbosePreference
180+
}
181+
166182
$clEntryParams = @{
167183
EntryCategories = $categories
168184
DefaultCategory = $defaultCategory
@@ -171,22 +187,23 @@ $clEntryParams = @{
171187
'Issue-Bug' = '🐛'
172188
}
173189
NoThanks = $noThanks
190+
Verbose = $VerbosePreference
174191
}
175192

176193
$clSectionParams = @{
177194
Categories = $categories.Keys
178195
DefaultCategory = $defaultCategory
179-
ReleaseName = $ReleaseName
180196
DateFormat = $dateFormat
197+
Verbose = $VerbosePreference
181198
}
182199

183200
Write-Verbose "Creating PSES changelog"
184201

185-
$psesChangelogSection = Get-GitCommit -SinceRef $SinceRef -UntilRef $UntilRef -GitHubToken $GitHubToken -RepositoryPath $PsesRepositoryPath -Verbose:$VerbosePreference |
202+
$psesChangelogSection = Get-GitCommit @psesGetCommitParams |
186203
Get-ChangeInfoFromCommit -GitHubToken $GitHubToken -Verbose:$VerbosePreference |
187204
Skip-IgnoredChange @ignore -Verbose:$VerbosePreference |
188-
New-ChangelogEntry @clEntryParams -Verbose:$VerbosePreference |
189-
New-ChangelogSection @clSectionParams -Verbose:$VerbosePreference
205+
New-ChangelogEntry @clEntryParams |
206+
New-ChangelogSection @clSectionParams -ReleaseName $PsesReleaseName
190207

191208
Write-Host "PSES CHANGELOG:`n`n$psesChangelogSection`n`n"
192209

@@ -212,7 +229,15 @@ $psesChangelogPostamble = $psesChangelogSection -split "`n"
212229
$psesChangelogPostamble = @("#### [$psesRepoName](https://github.com/$Organization/$psesRepoName)") + $psesChangelogPostamble[2..($psesChangelogPostamble.Length-3)]
213230
$psesChangelogPostamble = $psesChangelogPostamble -join "`n"
214231

215-
$psextChangelogSection = Get-GitCommit -SinceRef $SinceRef -UntilRef $UntilRef -GitHubToken $GitHubToken -RepositoryPath $PSExtensionRepositoryPath -Verbose:$VerbosePreference |
232+
$psExtGetCommitParams = @{
233+
SinceRef = $PSExtensionSinceRef
234+
UntilRef = $PSExtensionUntilRef
235+
GitHubToken = $GitHubToken
236+
RepositoryPath = $PSExtensionRepositoryPath
237+
Verbose = $VerbosePreference
238+
}
239+
240+
$psextChangelogSection = Get-GitCommit @psExtGetCommitParams |
216241
Get-ChangeInfoFromCommit -GitHubToken $GitHubToken -Verbose:$VerbosePreference |
217242
Skip-IgnoredChange @ignore -Verbose:$VerbosePreference |
218243
New-ChangelogEntry @clEntryParams -Verbose:$VerbosePreference |

0 commit comments

Comments
 (0)