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

Back out "cascades" enforcement because it caused too many stealth merge conflicts. (#20181)

Browse Source 
Mostly reverts https://github.com/microsoft/vcpkg/pull/20140

See https://github.com/microsoft/vcpkg/discussions/20180 for further discussion.
This commit is contained in:
Billy O'Neal 2021-09-15 11:39:39 -07:00 committed by GitHub
parent 92af1ff59a
commit 93a8320399
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/azure-pipelines/linux/azure-pipelines.yml
View File

@ -45,7 +45,7 @@ jobs:
inputs:
failOnStderr: true
filePath: 'scripts/azure-pipelines/test-modified-ports.ps1'
arguments: '-Triplet x64-linux -BuildReason $(Build.Reason) -BinarySourceStub "$(X_VCPKG_BINARY_SOURCE_STUB)" -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory) -EnforceCascades'
arguments: '-Triplet x64-linux -BuildReason $(Build.Reason) -BinarySourceStub "$(X_VCPKG_BINARY_SOURCE_STUB)" -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)'
pwsh: true
- bash: |
df -h

2
scripts/azure-pipelines/osx/azure-pipelines.yml
View File

@ -39,7 +39,7 @@ jobs:
inputs:
failOnStderr: true
filePath: 'scripts/azure-pipelines/test-modified-ports.ps1'
arguments: '-Triplet x64-osx -BuildReason $(Build.Reason) -BinarySourceStub "$(BINARY_SOURCE_STUB)" -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory) -EnforceCascades'
arguments: '-Triplet x64-osx -BuildReason $(Build.Reason) -BinarySourceStub "$(BINARY_SOURCE_STUB)" -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)'
pwsh: true
- bash: |
df -h

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

@ -30,9 +30,6 @@ not, binary caching will default to read-write mode.
.PARAMETER PassingIsPassing
Indicates that 'Passing, remove from fail list' results should not be emitted as failures. (For example, this is used
when using vcpkg to test a prerelease MSVC++ compiler)
.PARAMETER EnforceCascades
Enforces that the cascade count from ci.baseline.txt and "supports" is consistent with last known values.
#>
[CmdletBinding(DefaultParameterSetName="ArchivesRoot")]
@ -51,9 +48,7 @@ Param(
$BinarySourceStub = $null,
$BuildReason = $null,
[switch]
$PassingIsPassing = $false,
[switch]
$EnforceCascades = $false
$PassingIsPassing = $false
)
if (-Not ((Test-Path "triplets/$Triplet.cmake") -or (Test-Path "triplets/community/$Triplet.cmake"))) {
@ -131,42 +126,15 @@ $skipList = . "$PSScriptRoot/generate-skip-list.ps1" `
-BaselineFile "$PSScriptRoot/../ci.baseline.txt" `
-SkipFailures:$skipFailures
$ciArgs = $commonArgs
if ($EnforceCascades) {
if ($Triplet -eq 'x86-windows') {
$cascades = 28
} elseif ($Triplet -eq 'x64-windows') {
$cascades = 21
} elseif ($Triplet -eq 'x64-windows-static') {
$cascades = 59
} elseif ($Triplet -eq 'x64-windows-static-md') {
$cascades = 53
} elseif ($Triplet -eq 'x64-uwp') {
$cascades = 345
} elseif ($Triplet -eq 'arm64-windows') {
$cascades = 228
} elseif ($Triplet -eq 'arm-uwp') {
$cascades = 345
} elseif ($Triplet -eq 'x64-osx') {
$cascades = 61
} elseif ($Triplet -eq 'x64-linux') {
$cascades = 31
} else {
throw "Unknown triplet ($Triplet); could not determine expected cascade count. Update test-modified-ports.ps1."
}
$ciArgs += @("--x-skipped-cascade-count=$cascades")
}
if ($Triplet -in @('x64-windows', 'x64-osx', 'x64-linux'))
{
# WORKAROUND: These triplets are native-targetting which triggers an issue in how vcpkg handles the skip list.
# The workaround is to pass the skip list as host-excludes as well.
& "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --host-exclude=$skipList --failure-logs=$failureLogs @ciArgs
& "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --host-exclude=$skipList --failure-logs=$failureLogs @commonArgs
}
else
{
& "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --failure-logs=$failureLogs @ciArgs
& "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --failure-logs=$failureLogs @commonArgs
}
if ($LASTEXITCODE -ne 0)

2
scripts/azure-pipelines/windows/azure-pipelines.yml
View File

@ -39,7 +39,7 @@ jobs:
inputs:
failOnStderr: true
filePath: 'scripts/azure-pipelines/test-modified-ports.ps1'
arguments: '-Triplet ${{ parameters.triplet }} -BuildReason $(Build.Reason) -BinarySourceStub "$(X_VCPKG_BINARY_SOURCE_STUB)" -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory) -EnforceCascades'
arguments: '-Triplet ${{ parameters.triplet }} -BuildReason $(Build.Reason) -BinarySourceStub "$(X_VCPKG_BINARY_SOURCE_STUB)" -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)'
pwsh: true
- task: PowerShell@2
displayName: 'Validate version files'