Skip to content

make Linux packages use correct version scheme for preview releases #6318

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

Merged
TravisEz13 merged 2 commits into from
Mar 7, 2018
Merged

make Linux packages use correct version scheme for preview releases #6318

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc4e592
[package] make Linux packages use correct version scheme for preview …
TravisEz13 Mar 5, 2018
ccb79f2
[package] Address PR feedback
TravisEz13 Mar 5, 2018
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
36 changes: 33 additions & 3 deletions tools/packaging/packaging.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,6 +555,7 @@ function New-UnixPackage {
$ErrorMessage = "Must be on {0} to build '$Type' packages!"
switch ($Type) {
"deb" {
$packageVersion = Get-LinuxPackageSemanticVersion -Version $Version
if (!$Environment.IsUbuntu -and !$Environment.IsDebian) {
throw ($ErrorMessage -f "Ubuntu or Debian")
}
Expand All @@ -580,11 +581,13 @@ function New-UnixPackage {
$Iteration += ".$DebDistro"
}
"rpm" {
$packageVersion = Get-LinuxPackageSemanticVersion -Version $Version
if (!$Environment.IsRedHatFamily -and !$Environment.IsSUSEFamily) {
throw ($ErrorMessage -f "Redhat or SUSE Family")
}
}
"osxpkg" {
$packageVersion = $Version
if (!$Environment.IsMacOS) {
throw ($ErrorMessage -f "macOS")
}
Expand All @@ -600,7 +603,7 @@ function New-UnixPackage {
$Suffix = $Name -replace "^powershell"
if (!$Suffix) {
Write-Verbose "Suffix not given, building primary PowerShell package!"
$Suffix = $Version
$Suffix = $packageVersion
}

# Setup staging directory so we don't change the original source directory
Expand Down Expand Up @@ -677,7 +680,7 @@ function New-UnixPackage {

$Arguments = Get-FpmArguments `
-Name $Name `
-Version $Version `
-Version $packageVersion `
-Iteration $Iteration `
-Description $Description `
-Type $Type `
Expand Down Expand Up @@ -790,7 +793,7 @@ function New-MacOsDistributionPackage
# 1 - version
# 2 - package path
# 2 - minimum os version
$PackagingStrings.OsxDistributionTemplate -f "PowerShell - $Version", $Version, $packageName, '10.12' | Out-File -Encoding ascii -FilePath $distributionXmlPath -Force
$PackagingStrings.OsxDistributionTemplate -f "PowerShell - $packageVersion", $packageVersion, $packageName, '10.12' | Out-File -Encoding ascii -FilePath $distributionXmlPath -Force

log "Applying distribution.xml to package..."
Push-Location $tempDir
Expand Down Expand Up @@ -1950,6 +1953,33 @@ function Get-PackageSemanticVersion
$packageSemanticVersion
}

# Builds coming out of this project can have version number as 'M.m.p-previewName[Number]' OR 'M.m.p'
# This function converts the above version into semantic version major.minor.patch[~previewName[Number]] format
function Get-LinuxPackageSemanticVersion
{
[CmdletBinding()]
param (
# Version of the Package
[Parameter(Mandatory = $true)]
[ValidatePattern("^\d+\.\d+\.\d+(-\w+(\.\d+)?)?$")]
[ValidateNotNullOrEmpty()]
[string] $Version
)

Write-Verbose "Extract the semantic version in the form of major.minor[.build-quality[.revision]] for $Version"
$packageVersionTokens = $Version.Split('-')

if ($packageVersionTokens.Count -eq 1) {
# In case the input is of the form a.b.c, we use the same form
$packageSemanticVersion = $Version
} elseif ($packageVersionTokens.Count -ge 2) {
$packageRevisionTokens = ($packageVersionTokens[1..($packageVersionTokens.Count-1)] -join '-')
$packageSemanticVersion = ('{0}~{1}' -f $packageVersionTokens[0], $packageRevisionTokens)
}

$packageSemanticVersion
}

# Builds coming out of this project can have version number as 'a.b.c-stringf.d-e-f' OR 'a.b.c.d-e-f'
# This function converts the above version into semantic version major.minor[.build-quality[-revision]] format needed for nuget
function Get-NugetSemanticVersion
Expand Down