Skip to content

Commit 665d377

Browse files
authored
fix version mismatch in build (#539)
1 parent 2dae715 commit 665d377

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

Diff for: build.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ End {
305305
{
306306
$actualTagData = $allMeta.ActualTagDataByGroup.$tagGroup
307307
$SubImagePath = Join-Path -Path $dockerFileName -ChildPath $allMeta.Meta.SubImage
308-
Write-Verbose -Message "getting subimage - fromtag: $($dockerFileName) - subimage: $($allMeta.Meta.SubImage)" -Verbose
308+
Write-Verbose -Message "getting subimage - fromtag: $($dockerFileName) - subimage: $($allMeta.Meta.SubImage)"
309309
$subImageAllMeta = Get-DockerImageMetaDataWrapper `
310310
-DockerFileName $SubImagePath `
311311
-CI:$CI.IsPresent `

Diff for: createAllManifests.ps1

+15-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,21 @@ $buildScriptPath = Join-Path -Path $PSScriptRoot -ChildPath 'build.ps1'
6969

7070
$createScriptPath = Join-Path -Path $PSScriptRoot -ChildPath 'createManifest.ps1'
7171

72-
$json = Start-NativeExecution -sb ([scriptblock]::Create("$buildScriptPath -GenerateManifestLists -Channel $Channel -OsFilter All"))
72+
$extraParams = ''
73+
74+
if ($env:STABLERELEASETAG) {
75+
$extraParams += " -StableVersion $($env:STABLERELEASETAG -replace '^v')"
76+
}
77+
78+
if ($env:PREVIEWRELEASETAG) {
79+
$extraParams += " -PreviewVersion $($env:PREVIEWRELEASETAG -replace '^v')"
80+
}
81+
82+
if ($env:LTSRELEASETAG) {
83+
$extraParams += " -LtsVersion $($env:LTSRELEASETAG -replace '^v')"
84+
}
85+
86+
$json = Start-NativeExecution -sb ([scriptblock]::Create("$buildScriptPath -GenerateManifestLists -Channel $Channel -OsFilter All $extraParams"))
7387

7488
$manifestLists = $json | ConvertFrom-Json
7589

Diff for: tools/buildHelper/buildHelper.psm1

+1-1
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ function Get-DockerImageMetaDataWrapper
485485
}
486486
}
487487
else {
488-
Write-Verbose "getting docker tag list" -Verbose
488+
Write-Verbose "getting docker tag list"
489489
if($shortTags)
490490
{
491491
$tagDataFromScript = Get-DockerTagList -ShortTag $shortTags -FullTag $fullTag

0 commit comments

Comments
 (0)