Skip to content

Commit 2d74a31

Browse files
Sync eng/common directory with azure-sdk-tools for PR 1335 (Azure#13358)
* Lossen up $RELEASE_TITLE_REGEX to accomodate wrongly formated changelogs * Update changelog logic to use ordered hashtable * Update semver and Changelog logic Co-authored-by: Chidozie Ononiwu <chononiw@microsoft.com>
1 parent a7e74bc commit 2d74a31

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

eng/common/scripts/ChangeLog-Operations.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
. "${PSScriptRoot}\logging.ps1"
33
. "${PSScriptRoot}\SemVer.ps1"
44

5-
$RELEASE_TITLE_REGEX = "(?<releaseNoteTitle>^\#+.*(?<version>\b\d+\.\d+\.\d+([^0-9\s][^\s:]+)?)(\s+(?<releaseStatus>\(Unreleased\)|\(\d{4}-\d{2}-\d{2}\)))?)"
5+
$RELEASE_TITLE_REGEX = "(?<releaseNoteTitle>^\#+.*(?<version>\b\d+\.\d+\.\d+([^0-9\s][^\s:]+)?)(\s+(?<releaseStatus>\(.*\)))?)"
66
$CHANGELOG_UNRELEASED_STATUS = "(Unreleased)"
77
$CHANGELOG_DATE_FORMAT = "yyyy-MM-dd"
88

@@ -13,7 +13,7 @@ function Get-ChangeLogEntries {
1313
[String]$ChangeLogLocation
1414
)
1515

16-
$changeLogEntries = @{}
16+
$changeLogEntries = [Ordered]@{}
1717
if (!(Test-Path $ChangeLogLocation)) {
1818
LogError "ChangeLog[${ChangeLogLocation}] does not exist"
1919
return $null
@@ -57,7 +57,7 @@ function Get-ChangeLogEntry {
5757
)
5858
$changeLogEntries = Get-ChangeLogEntries -ChangeLogLocation $ChangeLogLocation
5959

60-
if ($changeLogEntries -and $changeLogEntries.ContainsKey($VersionString)) {
60+
if ($changeLogEntries -and $changeLogEntries.Contains($VersionString)) {
6161
return $changeLogEntries[$VersionString]
6262
}
6363
return $null

eng/common/scripts/SemVer.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ class AzureEngSemanticVersion {
181181
{
182182
$versions = $versionStrings | ForEach-Object { [AzureEngSemanticVersion]::ParseVersionString($_) }
183183
$sortedVersions = [AzureEngSemanticVersion]::SortVersions($versions)
184-
return ($sortedVersions | ForEach-Object { $_.ToString() })
184+
return ($sortedVersions | ForEach-Object { $_.RawVersion })
185185
}
186186

187187
static [AzureEngSemanticVersion[]] SortVersions([AzureEngSemanticVersion[]] $versions)

eng/common/scripts/Update-ChangeLog.ps1

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@ LogDebug "The latest release note entry in the changelog is for version [$($Late
8989

9090
$LatestsSorted = [AzureEngSemanticVersion]::SortVersionStrings(@($LatestVersion, $Version))
9191
if ($LatestsSorted[0] -ne $Version) {
92-
LogWarning "Version [$Version] is older than the latestversion [$LatestVersion] in the changelog. Please use a more recent version."
93-
exit(0)
92+
LogWarning "Version [$Version] is older than the latestversion [$LatestVersion] in the changelog. Consider using a more recent version."
9493
}
9594

9695
if ($ReplaceLatestEntryTitle)
@@ -99,7 +98,7 @@ if ($ReplaceLatestEntryTitle)
9998
LogDebug "Resetting latest entry title to [$($newChangeLogEntry.ReleaseTitle)]"
10099
$ChangeLogEntries.Remove($LatestVersion)
101100
if ($newChangeLogEntry) {
102-
$ChangeLogEntries[$Version] = $newChangeLogEntry
101+
$ChangeLogEntries.Insert(0, $Version, $newChangeLogEntry)
103102
}
104103
else {
105104
LogError "Failed to create new changelog entry"
@@ -117,7 +116,7 @@ else
117116
LogDebug "Adding new ChangeLog entry for Version [$Version]"
118117
$newChangeLogEntry = New-ChangeLogEntry -Version $Version -Status $ReleaseStatus
119118
if ($newChangeLogEntry) {
120-
$ChangeLogEntries[$Version] = $newChangeLogEntry
119+
$ChangeLogEntries.Insert(0, $Version, $newChangeLogEntry)
121120
}
122121
else {
123122
LogError "Failed to create new changelog entry"

0 commit comments

Comments
 (0)