aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorVictor Romero <romerosanchezv@gmail.com>2021-01-14 22:43:13 -0800
committerGitHub <noreply@github.com>2021-01-14 22:43:13 -0800
commitf87c92e42c56cf45316ba395504bdfb53967347d (patch)
tree73e2abc8230816a6c9c64372069e317cb6384efa /scripts
parentf649f9a67e0769aabb04f02ccaba816abd0089e2 (diff)
downloadvcpkg-f87c92e42c56cf45316ba395504bdfb53967347d.tar.gz
vcpkg-f87c92e42c56cf45316ba395504bdfb53967347d.zip
Reorder CI checks (#15662)
* Reorder CI checks * Modify error message on local port changes * Modify error message on local port changes - pt.2
Diffstat (limited to 'scripts')
-rw-r--r--scripts/azure-pipelines/windows/azure-pipelines.yml30
1 files changed, 15 insertions, 15 deletions
diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml
index a7fb6408b..d97490093 100644
--- a/scripts/azure-pipelines/windows/azure-pipelines.yml
+++ b/scripts/azure-pipelines/windows/azure-pipelines.yml
@@ -25,6 +25,21 @@ jobs:
# Note: D: is the Azure machines' temporary disk.
- script: .\bootstrap-vcpkg.bat
displayName: 'Build vcpkg'
+ - task: PowerShell@2
+ displayName: 'Run vcpkg end-to-end tests'
+ condition: eq('${{ parameters.triplet }}', 'x86-windows')
+ inputs:
+ filePath: 'scripts/azure-pipelines/end-to-end-tests.ps1'
+ arguments: '-Triplet ${{ parameters.triplet }} -WorkingRoot ${{ variables.WORKING_ROOT }}'
+ pwsh: true
+ - task: PowerShell@2
+ displayName: 'Validate version files'
+ condition: eq('${{ parameters.triplet }}', 'x86-windows')
+ inputs:
+ targetType: inline
+ script: |
+ ./vcpkg.exe --feature-flags=versions x-ci-verify-versions --verbose
+ pwsh: true
- task: CmdLine@2
displayName: "Build vcpkg with CMake, with older VS, and Run Tests"
condition: eq('${{ parameters.triplet }}', 'x86-windows')
@@ -45,21 +60,6 @@ jobs:
cmake --build build.x86.vs2017
failOnStderr: true
- task: PowerShell@2
- displayName: 'Run vcpkg end-to-end tests'
- condition: eq('${{ parameters.triplet }}', 'x86-windows')
- inputs:
- filePath: 'scripts/azure-pipelines/end-to-end-tests.ps1'
- arguments: '-Triplet ${{ parameters.triplet }} -WorkingRoot ${{ variables.WORKING_ROOT }}'
- pwsh: true
- - task: PowerShell@2
- displayName: 'Validate version files'
- condition: eq('${{ parameters.triplet }}', 'x86-windows')
- inputs:
- targetType: inline
- script: |
- ./vcpkg.exe --feature-flags=versions x-ci-verify-versions --verbose
- pwsh: true
- - task: PowerShell@2
displayName: '*** Test Modified Ports and Prepare Test Logs ***'
inputs:
failOnStderr: true