From 7310241d5ddf5a05ce43e2f57cb2ba8f4d2d61f3 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 24 Mar 2022 00:16:17 +0100 Subject: [PATCH] [vcpk-ci] Trigger some test ports from vcpkg.cmake changes (#23430) * Trigger some test ports from vcpkg.cmake changes * Bump test port version * Revert "Bump test port version" * Use old toolchain version for parent hashes * Add ABI hashing note to vcpkg.cmake * Test vcpkg.cmake with cmake instead vpckg-ci-paraview --- scripts/azure-pipelines/test-modified-ports.ps1 | 9 +++++++++ scripts/buildsystems/vcpkg.cmake | 2 ++ 2 files changed, 11 insertions(+) diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index d0b542c57d..57f13a2b58 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -165,11 +165,20 @@ if (($BuildReason -eq 'PullRequest') -and -not $NoParentHashes) $parentHashesFile = Join-Path $ArtifactStagingDirectory 'parent-hashes.json' $parentHashes = @("--parent-hashes=$parentHashesFile") & git revert -n -m 1 HEAD | Out-Null + # The vcpkg.cmake toolchain file is not part of ABI hashing, + # but changes must trigger at least some testing. + Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake" + Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake-user" & "./vcpkg$executableExtension" ci $Triplet --dry-run --exclude=$skipList @hostArgs @commonArgs --no-binarycaching "--output-hashes=$parentHashesFile" + Write-Host "Running CI using parent hashes" & git reset --hard HEAD } +# The vcpkg.cmake toolchain file is not part of ABI hashing, +# but changes must trigger at least some testing. +Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake" +Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake-user" & "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --failure-logs=$failureLogs @hostArgs @commonArgs @cachingArgs @parentHashes $failureLogsEmpty = (-Not (Test-Path $failureLogs) -Or ((Get-ChildItem $failureLogs).count -eq 0)) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 2bee6cbe86..138963133e 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -4,6 +4,8 @@ mark_as_advanced(CMAKE_TOOLCHAIN_FILE) # NOTE: to figure out what cmake versions are required for different things, # grep for `CMake 3`. All version requirement comments should follow that format. +# Attention: Changes to this file do not affect ABI hashing. + #[===[.md: # z_vcpkg_add_fatal_error Add a fatal error.