File tree 1 file changed +4
-2
lines changed
1 file changed +4
-2
lines changed Original file line number Diff line number Diff line change @@ -132,6 +132,7 @@ $parentHashes = @()
132
132
if (($BuildReason -eq ' PullRequest' ) -and -not $NoParentHashes )
133
133
{
134
134
$headBaseline = Get-Content " $PSScriptRoot /../ci.baseline.txt" - Raw
135
+ $headTool = Get-Content " $PSScriptRoot /../vcpkg-tool-metadata.txt" - Raw
135
136
136
137
# Prefetch tools for better output
137
138
foreach ($tool in @ (' cmake' , ' ninja' , ' git' )) {
@@ -154,7 +155,8 @@ if (($BuildReason -eq 'PullRequest') -and -not $NoParentHashes)
154
155
}
155
156
156
157
$parentBaseline = Get-Content " $PSScriptRoot /../ci.baseline.txt" - Raw
157
- if ($parentBaseline -eq $headBaseline )
158
+ $parentTool = Get-Content " $PSScriptRoot /../vcpkg-tool-metadata.txt" - Raw
159
+ if (($parentBaseline -eq $headBaseline ) -and ($parentTool -eq $headTool ))
158
160
{
159
161
Write-Host " CI baseline unchanged, determining parent hashes"
160
162
$parentHashesFile = Join-Path $ArtifactStagingDirectory ' parent-hashes.json'
@@ -173,7 +175,7 @@ if (($BuildReason -eq 'PullRequest') -and -not $NoParentHashes)
173
175
}
174
176
else
175
177
{
176
- Write-Host " CI baseline was modified, not using parent hashes"
178
+ Write-Host " Tool or baseline modified, not using parent hashes"
177
179
}
178
180
179
181
Write-Host " Running CI for HEAD"
You can’t perform that action at this time.
0 commit comments