Skip to content

fix version mismatch in build #539

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.

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
merged 1 commit into from
Feb 11, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ End {
{
$actualTagData = $allMeta.ActualTagDataByGroup.$tagGroup
$SubImagePath = Join-Path -Path $dockerFileName -ChildPath $allMeta.Meta.SubImage
Write-Verbose -Message "getting subimage - fromtag: $($dockerFileName) - subimage: $($allMeta.Meta.SubImage)" -Verbose
Write-Verbose -Message "getting subimage - fromtag: $($dockerFileName) - subimage: $($allMeta.Meta.SubImage)"
$subImageAllMeta = Get-DockerImageMetaDataWrapper `
-DockerFileName $SubImagePath `
-CI:$CI.IsPresent `
Expand Down
16 changes: 15 additions & 1 deletion createAllManifests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,21 @@ $buildScriptPath = Join-Path -Path $PSScriptRoot -ChildPath 'build.ps1'

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

$json = Start-NativeExecution -sb ([scriptblock]::Create("$buildScriptPath -GenerateManifestLists -Channel $Channel -OsFilter All"))
$extraParams = ''

if ($env:STABLERELEASETAG) {
$extraParams += " -StableVersion $($env:STABLERELEASETAG -replace '^v')"
}

if ($env:PREVIEWRELEASETAG) {
$extraParams += " -PreviewVersion $($env:PREVIEWRELEASETAG -replace '^v')"
}

if ($env:LTSRELEASETAG) {
$extraParams += " -LtsVersion $($env:LTSRELEASETAG -replace '^v')"
}

$json = Start-NativeExecution -sb ([scriptblock]::Create("$buildScriptPath -GenerateManifestLists -Channel $Channel -OsFilter All $extraParams"))

$manifestLists = $json | ConvertFrom-Json

Expand Down
2 changes: 1 addition & 1 deletion tools/buildHelper/buildHelper.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ function Get-DockerImageMetaDataWrapper
}
}
else {
Write-Verbose "getting docker tag list" -Verbose
Write-Verbose "getting docker tag list"
if($shortTags)
{
$tagDataFromScript = Get-DockerTagList -ShortTag $shortTags -FullTag $fullTag
Expand Down