diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2016-11-11 15:39:41 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2016-11-16 21:25:21 +0000 |
| commit | 19c10b941c6f96a0a2845424d8af5d5072d141ab (patch) | |
| tree | cc4c34a24b9c46c4204a5c1ff5401e745549e1e8 /coin/provisioning/common | |
| parent | 93240adad1eadf7239943daba5bec2a3d993f351 (diff) | |
Verify conan manifests when installing packages
This check allows us to ensure authenticity of installed files.
Manifests are sorted to minimize diffs in future updates.
Manifests lack trailing newline, because adding it would break manifest
parser of conan 0.15.0.
Task-number: QTQAINFRA-998
Change-Id: I6db75a78ce552da29d63cc4ac03726df326b7be2
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'coin/provisioning/common')
| -rw-r--r-- | coin/provisioning/common/conan.ps1 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/coin/provisioning/common/conan.ps1 b/coin/provisioning/common/conan.ps1 index 32552aae..21f67c73 100644 --- a/coin/provisioning/common/conan.ps1 +++ b/coin/provisioning/common/conan.ps1 @@ -32,11 +32,12 @@ function Run-Conan-Install Get-ChildItem -Path "$ConanfilesDir\*.txt" | ForEach-Object { $outpwd = "C:\Utils\conanbuildinfos\$($BuildinfoDir)\$($_.BaseName)" + $manifestsDir = "$($_.DirectoryName)\$($_.BaseName).manifests" New-Item $outpwd -Type directory -Force Start-Process-Logged ` "C:\Utils\Conan\conan\conan.exe" ` -WorkingDirectory $outpwd ` - -ArgumentList "install -i -f $($_.FullName)", ` + -ArgumentList "install -f $($_.FullName) --verify $($manifestsDir)", ` '-s', ('compiler="' + $Compiler + '"'), ` "-s os=Windows -s arch=$($Arch) -s compiler.version=$($CompilerVersion) $($runtimeArg)" ` -NoNewWindow -Wait -Verbose |