From f87c92e42c56cf45316ba395504bdfb53967347d Mon Sep 17 00:00:00 2001
From: Victor Romero <romerosanchezv@gmail.com>
Date: Thu, 14 Jan 2021 22:43:13 -0800
Subject: Reorder CI checks (#15662)

* Reorder CI checks

* Modify error message on local port changes

* Modify error message on local port changes - pt.2
---
 .../azure-pipelines/windows/azure-pipelines.yml    | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'scripts')

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')
@@ -44,21 +59,6 @@ jobs:
         cmake -G "Visual Studio 16 2019" -A Win32 -T v141 -DBUILD_TESTING=OFF -DVCPKG_DEVELOPMENT_WARNINGS=OFF -DVCPKG_WARNINGS_AS_ERRORS=ON -DVCPKG_BUILD_FUZZING=OFF -B build.x86.vs2017 -S toolsrc
         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:
-- 
cgit v1.2.3