Update LTS logic to depend on metadata.json (#11877)

This commit is contained in:
Aditya Patwardhan
2020-02-18 15:01:54 -08:00
committed by GitHub
parent 3cb1b23a13
commit 84aeff861e
3 changed files with 11 additions and 26 deletions
+2 -14
View File
@@ -306,7 +306,6 @@ function Start-PSPackage {
PackageNameSuffix = 'fxdependent'
Version = $Version
Force = $Force
LTS = $LTS
}
if ($PSCmdlet.ShouldProcess("Create tar.gz Package")) {
@@ -369,7 +368,6 @@ function Start-PSPackage {
Name = $Name
Version = $Version
Force = $Force
LTS = $LTS
}
if ($PSCmdlet.ShouldProcess("Create tar.gz Package")) {
@@ -384,7 +382,6 @@ function Start-PSPackage {
Force = $Force
Architecture = "arm32"
ExcludeSymbolicLinks = $true
LTS = $LTS
}
if ($PSCmdlet.ShouldProcess("Create tar.gz Package")) {
@@ -399,7 +396,6 @@ function Start-PSPackage {
Force = $Force
Architecture = "arm64"
ExcludeSymbolicLinks = $true
LTS = $LTS
}
if ($PSCmdlet.ShouldProcess("Create tar.gz Package")) {
@@ -414,7 +410,6 @@ function Start-PSPackage {
Force = $Force
Architecture = "alpine-x64"
ExcludeSymbolicLinks = $true
LTS = $LTS
}
if ($PSCmdlet.ShouldProcess("Create tar.gz Package")) {
@@ -502,20 +497,13 @@ function New-TarballPackage {
[switch] $Force,
[switch] $ExcludeSymbolicLinks,
[switch] $LTS
[switch] $ExcludeSymbolicLinks
)
if ($PackageNameSuffix) {
$packageName = "$Name-$Version-{0}-$Architecture-$PackageNameSuffix.tar.gz"
} else {
$packageName = if ($LTS) {
"$Name-lts-$Version-{0}-$Architecture.tar.gz"
}
else {
"$Name-$Version-{0}-$Architecture.tar.gz"
}
$packageName = "$Name-$Version-{0}-$Architecture.tar.gz"
}
if ($Environment.IsWindows) {
@@ -32,12 +32,11 @@ if ($ReleaseTag)
$version = $ReleaseTag -replace '^v'
$semVersion = [System.Management.Automation.SemanticVersion] $version
## All even minor versions are LTS
$LTS = if ( $semVersion.PreReleaseLabel -eq $null -and $semVersion.Minor % 2 -eq 0) {
$true
} else {
$false
}
$metadata = Get-Content "$location/tools/metadata.json" -Raw | ConvertFrom-Json
$LTS = $metadata.LTSRelease
Write-Verbose -Verbose -Message "LTS is set to: $LTS"
function BuildPackages {
param(
@@ -40,12 +40,10 @@ if ($Build.IsPresent) {
$version = $ReleaseTag -replace '^v'
$semVersion = [System.Management.Automation.SemanticVersion] $version
## All even minor versions are LTS
$LTS = if ( $semVersion.PreReleaseLabel -eq $null -and $semVersion.Minor % 2 -eq 0) {
$true
} else {
$false
}
$metadata = Get-Content "$location/tools/metadata.json" -Raw | ConvertFrom-Json
$LTS = $metadata.LTSRelease
Write-Verbose -Verbose -Message "LTS is set to: $LTS"
}
}