Skip to content

Add lts to release build #371

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 3 commits into from
Feb 14, 2020
Merged

Add lts to release build #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ede56d8
Add lts to release build
TravisEz13 Feb 3, 2020
a9223d6
Update to secret scan v2
TravisEz13 Feb 4, 2020
b79f204
remove extra character
TravisEz13 Feb 7, 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
4 changes: 4 additions & 0 deletions .vsts-ci/releasePhase.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ jobs:
$releaseTag = '$(previewReleaseTag)'
$version = '$(previewReleaseTag)' -replace '^v', ''
}
'lts' {
$releaseTag = '$(ltsReleaseTag)'
$version = '$(ltsReleaseTag)' -replace '^v', ''
}
default {
throw "Unknown channel '$(Channel)'"
}
Expand Down
11 changes: 9 additions & 2 deletions .vsts-ci/releasebuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: s_$(stableReleaseTag)_p_$(previewReleaseTag)$(Rev:_rr)
name: s_$(stableReleaseTag)_p_$(previewReleaseTag)_l_$(ltsReleaseTag)$(Rev:_rr)

resources:
- repo: self
Expand All @@ -14,11 +14,15 @@ stages:
- template: releaseStage.yml
parameters:
channel: preview
- template: releaseStage.yml
parameters:
channel: lts

- stage: GenerateManifests
dependsOn:
- GenerateYaml_stable
- GenerateYaml_preview
- GenerateYaml_lts
jobs:
- job: PreviewManifestPhase
variables:
Expand Down Expand Up @@ -65,6 +69,8 @@ stages:
Write-Host "##vso[task.setvariable variable=StableVersion;]$stableVersion"
$previewVersion = '$(previewReleaseTag)' -replace '^v', ''
Write-Host "##vso[task.setvariable variable=PreviewVersion;]$previewVersion"
$ltsVersion = '$(ltsReleaseTag)' -replace '^v', ''
Write-Host "##vso[task.setvariable variable=LtsVersion;]$ltsVersion"
displayName: 'Set Versions'

- powershell: 'Get-ChildItem env:'
Expand All @@ -74,7 +80,7 @@ stages:
displayName: 'Install Pester'

- powershell: |
$yaml = ./build.ps1 -GenerateTagsYaml -Channel stable, preview -StableVersion $(StableVersion) -PreviewVersion $(PreviewVersion)
$yaml = ./build.ps1 -GenerateTagsYaml -Channel stable, preview -StableVersion $(StableVersion) -PreviewVersion $(PreviewVersion) -LtsVersion $(LtsVersion)
$yaml | Out-File -Encoding ascii -Path ./tagsmetadata.yaml
Get-ChildItem -Path ./tagsmetadata.yaml | Select-Object -ExpandProperty FullName | ForEach-Object {
Write-Host "##vso[artifact.upload containerfolder=artifacts;artifactname=artifacts]$_"
Expand All @@ -86,6 +92,7 @@ stages:
@{
'previewReleaseTag' = '$(previewReleaseTag)'
'stableReleaseTag' = '$(stableReleaseTag)'
'ltsReleaseTag' = '$(ltsReleaseTag)'
}|convertto-json | out-file -FilePath $path -Encoding ascii
Write-Host "##vso[artifact.upload containerfolder=releaseTags;artifactname=releaseTags]$path"
displayName: Save release Tags
Expand Down
7 changes: 7 additions & 0 deletions build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,12 @@ param(
[string]
$StableVersion,

[Parameter(ParameterSetName="GenerateMatrixJson")]
[Parameter(ParameterSetName="GenerateTagsYaml")]
[ValidatePattern('(\d+\.){2}\d(-\w+(\.\d+)?)?')]
[string]
$LtsVersion,

[Parameter(ParameterSetName="GenerateMatrixJson")]
[Parameter(ParameterSetName="GenerateTagsYaml")]
[ValidatePattern('(\d+\.){2}\d(-\w+(\.\d+)?)?')]
Expand Down Expand Up @@ -236,6 +242,7 @@ End {
ServicingVersion = if($Version) {$Version} else {$ServicingVersion}
PreviewVersion = if($Version) {$Version} else {$PreviewVersion}
StableVersion = if($Version) {$Version} else {$StableVersion}
LtsVersion = if($Version) {$Version} else {$LtsVersion}
}

# Get Versions
Expand Down
11 changes: 7 additions & 4 deletions tools/buildHelper/buildHelper.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,10 +298,13 @@ function Get-Versions
$PreviewVersion,

[string]
$StableVersion
$StableVersion,

[string]
$LtsVersion
)

Write-Verbose "Getting Version for $Channel - servicing: $ServicingVersion; Preview: $PreviewVersion; stable: $stableVersion"
Write-Verbose "Getting Version for $Channel - servicing: $ServicingVersion; Preview: $PreviewVersion; stable: $stableVersion; stable: $ltsVersion"

$versionExtraParams = @{}

Expand All @@ -316,8 +319,8 @@ function Get-Versions
$linuxVersion = Get-PowerShellVersion -Linux -Servicing @versionExtraParams
}
'lts$' {
if($StableVersion){
$versionExtraParams['Version'] = $StableVersion
if($LtsVersion){
$versionExtraParams['Version'] = $LtsVersion
}

$windowsVersion = Get-PowerShellVersion -Lts @versionExtraParams
Expand Down
1 change: 1 addition & 0 deletions vsts-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ stages:
displayName: 'Scan for secrets'
inputs:
debugMode: false
toolMajorVersion: V2

- task: securedevelopmentteam.vss-secure-development-tools.build-task-publishsecurityanalysislogs.PublishSecurityAnalysisLogs@2
displayName: 'Publish Secret Scan Logs to Build Artifacts'
Expand Down