Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support calculating and setting release date #14876

Merged
merged 5 commits into from
Sep 4, 2020
Merged

Support calculating and setting release date #14876

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e0ed2ac
Support calculating and setting release date
pakrym Sep 3, 2020
7e49e85
FB
pakrym Sep 3, 2020
b960c38
More FB
pakrym Sep 3, 2020
ad06aa2
Tuesday
pakrym Sep 3, 2020
6309470
Merge branch 'master' into pakrym/support-setting-release-data
pakrym Sep 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions eng/common/Update-Change-Log.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ param (
[Parameter(Mandatory = $true)]
[String]$ChangeLogPath,
[String]$Unreleased = $True,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are you declaring booleans as strings? PowerShell way is [switch] $Unreleased. Specifying it means $true, but you can pass :$false or :$true explicitly like -Unreleased:$false.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't know :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll leave it as is for now.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes lets not change too much here currently. @chidozieononiwu does have issue Azure/azure-sdk-tools#829 which we will use as a clean-up effort for our various PS scripts.

[String]$ReplaceVersion = $False
[String]$ReplaceVersion = $False,
$ReleaseDate
pakrym marked this conversation as resolved.
Show resolved Hide resolved
)


Expand Down Expand Up @@ -46,8 +47,8 @@ function Get-VersionTitle($Version, $Unreleased)
# Generate version title
$newVersionTitle = "## $Version $UNRELEASED_TAG"
if ($Unreleased -eq $False) {
$releaseDate = Get-Date -Format "(yyyy-MM-dd)"
$newVersionTitle = "## $Version $releaseDate"
$actualReleaseDate = $ReleaseDate ?? (Get-Date -Format "yyyy-MM-dd");
pakrym marked this conversation as resolved.
Show resolved Hide resolved
$newVersionTitle = "## $Version ($actualReleaseDate)"
}
return $newVersionTitle
}
Expand Down Expand Up @@ -95,7 +96,7 @@ function Get-NewChangeLog( [System.Collections.ArrayList]$ChangelogLines, $Versi
exit(0)
}

if (($ReplaceVersion -eq $True) -and ($Unreleased -eq $False) -and $CurrentTitle.Contains($version) -and (-not $CurrentTitle.Contains($UNRELEASED_TAG))) {
if (($ReplaceVersion -eq $True) -and ($Unreleased -eq $False) -and $CurrentTitle.Contains($version) -and (-not $CurrentTitle.Contains($UNRELEASED_TAG)) -and (-not $ReleaseDate)) {
Write-Host "Version is already present in change log with a release date."
exit(0)
}
Expand Down
42 changes: 31 additions & 11 deletions eng/scripts/Prepare-Release.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[CmdletBinding()]
param(
[Parameter(Mandatory=$true)]
$package
[string]$package,
pakrym marked this conversation as resolved.
Show resolved Hide resolved
$ReleaseDate
)

function Get-LevenshteinDistance {
Expand Down Expand Up @@ -166,19 +167,37 @@ else
Write-Host
Write-Host "Detected released type $releaseType" -ForegroundColor Green

Write-Host
Write-Host "Updating versions" -ForegroundColor Green

& "$repoRoot\eng\scripts\Update-PkgVersion.ps1" -ServiceDirectory $serviceDirectory -PackageName $package -NewVersionString $newVersion

$date = Get-Date
$month = $date.ToString("MMMM")
if ($date.Day -gt 15)
if (!$ReleaseDate)
{
$currentDate = Get-Date
if ($currentDate.Day -gt 15)
{
$ReleaseDate = (Get-Date -Day 1).AddMonths(1)
while ($ReleaseDate.DayOfWeek -ne 5)
{
$ReleaseDate = $ReleaseDate.AddDays(1)
}
}
else
{
$ReleaseDate = $currentDate
}
}
else
{
$month = $date.AddMonths(1).ToString("MMMM")
$ReleaseDate = [datetime]::ParseExact($ReleaseDate, 'yyyy-MM-dd', [Globalization.CultureInfo]::InvariantCulture)
}

$releaseDateString = $ReleaseDate.ToString("yyyy-MM-dd")
$month = $ReleaseDate.ToString("MMMM")

Write-Host
Write-Host "Assuming release is in $month" -ForegroundColor Green
Write-Host "Assuming release is in $month with release date $releaseDateString" -ForegroundColor Green

Write-Host
Write-Host "Updating versions" -ForegroundColor Green

& "$repoRoot\eng\scripts\Update-PkgVersion.ps1" -ServiceDirectory $serviceDirectory -PackageName $package -NewVersionString $newVersion -ReleaseDate $releaseDateString

$commonParameter = @("--organization", "https://dev.azure.com/azure-sdk", "-o", "json", "--only-show-errors")

Expand Down Expand Up @@ -219,6 +238,7 @@ $fields = @{
"Library Type"=$libraryType
"Release Type"=$releaseType
"Version Number"=$newVersion
"Planned Release Date"=$releaseDateString
"Notes"="<pre>"+$notes.Replace("`n", "<br>")+"</pre>"
}

Expand Down
10 changes: 7 additions & 3 deletions eng/scripts/Update-PkgVersion.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ Update-PkgVersion.ps1 -ServiceDirectory core -PackageName Azure.Core
Updating package version for Azure.Core with a specified verion
Update-PkgVersion.ps1 -ServiceDirectory core -PackageName Azure.Core -NewVersionString 2.0.5

Updating package version for Azure.Core with a specified verion and release date
Update-PkgVersion.ps1 -ServiceDirectory core -PackageName Azure.Core -NewVersionString 2.0.5 -ReleaseDate "2020-05-01"

Updating package version for Microsoft.Azure.CognitiveServices.AnomalyDetector
Update-PkgVersion.ps1 -ServiceDirectory cognitiveservices -PackageName Microsoft.Azure.CognitiveServices.AnomalyDetector -PackageDirName AnomalyDetector

Expand All @@ -42,7 +45,8 @@ Param (
[Parameter(Mandatory=$True)]
[string] $PackageName,
[string] $PackageDirName,
[string] $NewVersionString
[string] $NewVersionString,
[string] $ReleaseDate
)

. ${PSScriptRoot}\..\common\scripts\SemVer.ps1
Expand All @@ -68,7 +72,7 @@ if ([System.String]::IsNullOrEmpty($NewVersionString)) {
else {
$packageSemVer = [AzureEngSemanticVersion]::new($NewVersionString)

& "${PSScriptRoot}/../common/Update-Change-Log.ps1" -Version $packageSemVer.ToString() -ChangeLogPath $changeLogPath -Unreleased $false -ReplaceVersion $true
& "${PSScriptRoot}/../common/Update-Change-Log.ps1" -Version $packageSemVer.ToString() -ChangeLogPath $changeLogPath -Unreleased $false -ReplaceVersion $true -ReleaseDate $ReleaseDate
}

Write-Host "New Version: ${packageSemVer}"
Expand All @@ -77,7 +81,7 @@ if ($packageSemVer.HasValidPrereleaseLabel() -ne $true){
exit 1
}

if (!$packageOldSemVer.IsPrerelease) {
if (!$packageOldSemVer.IsPrerelease -and ($packageVersion -ne $NewVersionString)) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't set ApiCompatVersion if it's the same.

if (!$propertyGroup.ApiCompatVersion) {
$propertyGroup.InsertAfter($csproj.CreateElement("ApiCompatVersion"), $propertyGroup["Version"]) | Out-Null
$whitespace = $propertyGroup["Version"].PreviousSibling
Expand Down