[ci] Move to windows-2019 environment (#260)

* [ci] Move to windows-2019 environment * Fix quotes
HaxeFoundation · Apr 6, 2022 · 0b663ff · 0b663ff
1 parent 2ae2ff5
commit 0b663ff
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -26,7 +26,7 @@ stages:
         parameters:
           name: Linux
           linkType: dynamic
-          
+
       - template: extra/azure-pipelines/build-linux.yml
         parameters:
           name: LinuxStaticArm64
@@ -50,13 +50,13 @@ stages:
       - template: extra/azure-pipelines/build-windows.yml
         parameters:
           name: WinVS2017
-          vmImage: vs2017-win2016
+          vmImage: windows-2019
           cmakeGenerator: Visual Studio 15 2017
           arch: Win32
       - template: extra/azure-pipelines/build-windows.yml
         parameters:
           name: WinVS2017x64
-          vmImage: vs2017-win2016
+          vmImage: windows-2019
           cmakeGenerator: Visual Studio 15 2017 Win64
           arch: x64
 

diff --git a/extra/azure-pipelines/build-windows.yml b/extra/azure-pipelines/build-windows.yml
@@ -10,15 +10,17 @@ jobs:
     pool:
       vmImage: ${{ parameters.vmImage }}
     steps:
-      - ${{ if eq(parameters.vmImage, 'vs2017-win2016') }}:
+      - ${{ if startsWith(parameters.name, 'WinVS2017') }}:
         - powershell: |
-            Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
-            Write-Host "##vso[task.prependpath]C:\ProgramData\chocolatey\bin"
-          displayName: Install Chocolatey
-      - ${{ if eq(parameters.vmImage, 'vs2017-win2016') }}:
+            choco install visualstudio2017buildtools visualstudio2017-workload-vctools
+            # Install: Windows 8.1 SDK
+            Invoke-WebRequest -Method Get -Uri https://go.microsoft.com/fwlink/p/?LinkId=323507 -OutFile sdksetup.exe -UseBasicParsing
+            Start-Process -Wait sdksetup.exe -ArgumentList "/q", "/norestart", "/features", "OptionId.WindowsDesktopSoftwareDevelopmentKit", "OptionId.NetFxSoftwareDevelopmentKit"
+          displayName: Install VS2017 tools
+      - ${{ if startsWith(parameters.name, 'WinVS2017') }}:
         - script: cmake . -G "${{ parameters.cmakeGenerator }}"
           displayName: CMake
-      - ${{ if eq(parameters.vmImage, 'windows-2019') }}:
+      - ${{ if startsWith(parameters.name, 'WinVS2019') }}:
         - script: cmake . -G "${{ parameters.cmakeGenerator }}" -A ${{ parameters.arch }}
           displayName: CMake
       - script: |