3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 18:31:15 +08:00
Code Issues Projects Releases Wiki Activity

[vcpk-ci] Trigger some test ports from vcpkg.cmake changes (#23430)

Browse Source 
* 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
This commit is contained in:
Kai Pastor 2022-03-24 00:16:17 +01:00 committed by GitHub
parent 6ad0750a86
commit 7310241d5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/azure-pipelines/test-modified-ports.ps1
View File

@ -165,11 +165,20 @@ if (($BuildReason -eq 'PullRequest') -and -not $NoParentHashes)
$parentHashesFile = Join-Path $ArtifactStagingDirectory 'parent-hashes.json' $parentHashesFile = Join-Path $ArtifactStagingDirectory 'parent-hashes.json'
$parentHashes = @("--parent-hashes=$parentHashesFile") $parentHashes = @("--parent-hashes=$parentHashesFile")
& git revert -n -m 1 HEAD | Out-Null & 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" & "./vcpkg$executableExtension" ci $Triplet --dry-run --exclude=$skipList @hostArgs @commonArgs --no-binarycaching "--output-hashes=$parentHashesFile"
Write-Host "Running CI using parent hashes" Write-Host "Running CI using parent hashes"
& git reset --hard HEAD & 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 & "./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)) $failureLogsEmpty = (-Not (Test-Path $failureLogs) -Or ((Get-ChildItem $failureLogs).count -eq 0))

2
scripts/buildsystems/vcpkg.cmake
View File

@ -4,6 +4,8 @@ mark_as_advanced(CMAKE_TOOLCHAIN_FILE)
# NOTE: to figure out what cmake versions are required for different things, # NOTE: to figure out what cmake versions are required for different things,
# grep for `CMake 3`. All version requirement comments should follow that format. # grep for `CMake 3`. All version requirement comments should follow that format.
# Attention: Changes to this file do not affect ABI hashing.
#[===[.md: #[===[.md:
# z_vcpkg_add_fatal_error # z_vcpkg_add_fatal_error
Add a fatal error. Add a fatal error.