From 59be67df252a6d8bb5c07f80605fd967823eddfd Mon Sep 17 00:00:00 2001
From: Davide Beatrici <git@davidebeatrici.dev>
Date: Tue, 21 Jul 2020 22:01:19 +0200
Subject: [PATCH] Azure Pipelines: templatize Windows steps

---
 .ci/azure-pipelines-win-steps.yml | 24 ++++++++++++++++++++++++
 .ci/azure-pipelines-win.yml       | 22 +++-------------------
 2 files changed, 27 insertions(+), 19 deletions(-)
 create mode 100644 .ci/azure-pipelines-win-steps.yml

diff --git a/.ci/azure-pipelines-win-steps.yml b/.ci/azure-pipelines-win-steps.yml
new file mode 100644
index 00000000..caa14f67
--- /dev/null
+++ b/.ci/azure-pipelines-win-steps.yml
@@ -0,0 +1,24 @@
+parameters:
+- name: bits
+  type: string
+
+steps:
+- script: |
+    cd /d $(Build.BinariesDirectory)
+    call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars${{parameters.bits}}.bat"
+    cmake -G "Ninja" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_COMPILER=cl "-DCMAKE_CXX_COMPILER=cl" $(Build.SourcesDirectory)
+    cmake --build .
+  displayName: 'Build'
+- powershell: |
+    . .ci\appveyor-vpntest.ps1
+  displayName: 'Test'
+- task: CopyFiles@2
+  inputs:
+    sourceFolder: '$(Build.BinariesDirectory)'
+    contents: '?(*.exe|*.se2|*.pdb)'
+    TargetFolder: '$(Build.StagingDirectory)'
+    flattenFolders: true
+- task: PublishBuildArtifacts@1
+  inputs:
+    pathtoPublish: '$(Build.StagingDirectory)'
+    artifactName: 'Binaries'
diff --git a/.ci/azure-pipelines-win.yml b/.ci/azure-pipelines-win.yml
index 07e8e1a0..1d4f4321 100644
--- a/.ci/azure-pipelines-win.yml
+++ b/.ci/azure-pipelines-win.yml
@@ -4,22 +4,6 @@ jobs:
   pool:
     vmImage: vs2017-win2016
   steps:
-  - script: |
-      cd /d %BUILD_BINARIESDIRECTORY%
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-      cmake -G "Ninja" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_COMPILER=cl "-DCMAKE_CXX_COMPILER=cl" %BUILD_SOURCESDIRECTORY%
-      cmake --build .
-    displayName: 'Build'
-  - powershell: |
-      . .ci\appveyor-vpntest.ps1
-    displayName: 'Test'
-  - task: CopyFiles@2
-    inputs:
-      sourceFolder: '$(Build.BinariesDirectory)'
-      contents: '?(*.exe|*.se2|*.pdb)'
-      TargetFolder: '$(Build.StagingDirectory)'
-      flattenFolders: true
-  - task: PublishBuildArtifacts@1
-    inputs:
-      pathtoPublish: '$(Build.StagingDirectory)'
-      artifactName: 'Binaries'
+  - template: "azure-pipelines-win-steps.yml"
+    parameters:
+      bits: "64"