aboutsummaryrefslogtreecommitdiff
path: root/scripts/azure-pipelines/linux
diff options
context:
space:
mode:
authorBilly O'Neal <bion@microsoft.com>2021-09-15 11:39:39 -0700
committerGitHub <noreply@github.com>2021-09-15 11:39:39 -0700
commit93a8320399e2f0b22877e097dc8216d5c634b8dd (patch)
tree158cbadb54af9b719fdabc15689d160671707a85 /scripts/azure-pipelines/linux
parent92af1ff59a651c1cf43aca48f54369a86d40d81c (diff)
downloadvcpkg-93a8320399e2f0b22877e097dc8216d5c634b8dd.tar.gz
vcpkg-93a8320399e2f0b22877e097dc8216d5c634b8dd.zip
Back out "cascades" enforcement because it caused too many stealth merge conflicts. (#20181)
Mostly reverts https://github.com/microsoft/vcpkg/pull/20140 See https://github.com/microsoft/vcpkg/discussions/20180 for further discussion.
Diffstat (limited to 'scripts/azure-pipelines/linux')
-rw-r--r--scripts/azure-pipelines/linux/azure-pipelines.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/azure-pipelines/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml
index 530dba677..f68f971e5 100644
--- a/scripts/azure-pipelines/linux/azure-pipelines.yml
+++ b/scripts/azure-pipelines/linux/azure-pipelines.yml
@@ -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