From 84aeff861e68c2f282e99d80eb00a60018e4712b Mon Sep 17 00:00:00 2001 From: Aditya Patwardhan Date: Tue, 18 Feb 2020 15:01:54 -0800 Subject: [PATCH] Update `LTS` logic to depend on `metadata.json` (#11877) --- tools/packaging/packaging.psm1 | 16 ++-------------- .../GenericLinuxFiles/PowerShellPackage.ps1 | 11 +++++------ .../releaseBuild/macOS/PowerShellPackageVsts.ps1 | 10 ++++------ 3 files changed, 11 insertions(+), 26 deletions(-) diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1 index 268af8eb5f..06e40538b7 100644 --- a/tools/packaging/packaging.psm1 +++ b/tools/packaging/packaging.psm1 @@ -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) { diff --git a/tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1 b/tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1 index 63d2b5046e..23e4225acd 100644 --- a/tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1 +++ b/tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1 @@ -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( diff --git a/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 b/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 index 90bb91436c..be9ade2451 100644 --- a/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 +++ b/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 @@ -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" } }