CI(azure-pipelines): add 32 bit Windows build

As with the 64 bit build, it uses a build environment we provide on our website.

3 files changed, 33 insertions, 6 deletions

diff --git a/.ci/azure-pipelines/build_windows.bat b/.ci/azure-pipelines/build_windows.bat
index d9e2eb03a..08af1e0f8 100644
--- a/.ci/azure-pipelines/build_windows.bat
+++ b/.ci/azure-pipelines/build_windows.bat
@@ -25,11 +25,12 @@
 :: Defined in .azure-pipelines.yml:
 ::
 ::  MUMBLE_ENVIRONMENT_STORE     - Path to the folder the build environment is stored in.
-::  MUMBLE_ENVIRONMENT_SOURCE    - Build environment web source folder URL
+::  MUMBLE_ENVIRONMENT_SOURCE    - Build environment web source folder URL.
+::  MUMBLE_ENVIRONMENT_TRIPLET   - vcpkg triplet.
 ::  MUMBLE_ENVIRONMENT_VERSION   - Full build environment version
 ::                                 Must match archive and extracted folder name.
 ::  MUMBLE_ENVIRONMENT_TOOLCHAIN - Path to the vcpkg CMake toolchain, used for CMake.
-::
+::  VCVARS_PATH                  - Path to the Visual Studio environment initialization script.
 
 @echo on
 
@@ -37,7 +38,7 @@ for /f "tokens=* USEBACKQ" %%g in (`python "scripts/mumble-version.py"`) do (SET
 
 cd /d %BUILD_BINARIESDIRECTORY%
 
-call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+call "%VCVARS_PATH%"
 
 :: Delete MinGW, otherwise CMake picks it over MSVC.
 :: We don't delete the (Chocolatey) packages because it takes ~10 minutes...
@@ -48,7 +49,7 @@ del C:\Strawberry\c\bin\gcc.exe
 del C:\Strawberry\c\bin\g++.exe
 del C:\Strawberry\c\bin\c++.exe
 
-cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE="%MUMBLE_ENVIRONMENT_TOOLCHAIN%" -DVCPKG_TARGET_TRIPLET=x64-windows-static-md -DIce_HOME="%MUMBLE_ENVIRONMENT_PATH%\installed\x64-windows-static-md" -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=ON -Dversion=%VER% -Dpackaging=ON -Dstatic=ON -Dsymbols=ON -Dasio=ON -Dg15=ON "%BUILD_SOURCESDIRECTORY%"
+cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE="%MUMBLE_ENVIRONMENT_TOOLCHAIN%" -DVCPKG_TARGET_TRIPLET=%MUMBLE_ENVIRONMENT_TRIPLET% -DIce_HOME="%MUMBLE_ENVIRONMENT_PATH%\installed\%MUMBLE_ENVIRONMENT_TRIPLET%" -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=ON -Dversion=%VER% -Dpackaging=ON -Dstatic=ON -Dsymbols=ON -Dasio=ON -Dg15=ON "%BUILD_SOURCESDIRECTORY%"
 
 if errorlevel 1 (
 	exit /b %errorlevel%
diff --git a/.ci/azure-pipelines/main-pr.yml b/.ci/azure-pipelines/main-pr.yml
index 2eb58fb4a..86ead2a7b 100644
--- a/.ci/azure-pipelines/main-pr.yml
+++ b/.ci/azure-pipelines/main-pr.yml
@@ -5,11 +5,24 @@ variables:
   MUMBLE_ENVIRONMENT_TOOLCHAIN: '$(MUMBLE_ENVIRONMENT_PATH)/scripts/buildsystems/vcpkg.cmake'
 
 jobs:
-  - job: Windows
+  - job: Windows_x86_64
+    displayName: Windows (x86_64)
     pool:
       vmImage: 'windows-latest'
     variables:
       MUMBLE_ENVIRONMENT_VERSION: 'win64-static-1.4.x-2020-05-27-ecb3c64-1151'
+      MUMBLE_ENVIRONMENT_TRIPLET: 'x64-windows-static-md'
+      VCVARS_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat'
+    steps:
+    - template: steps_windows.yml
+  - job: Windows_x86
+    displayName: Windows (x86)
+    pool:
+      vmImage: 'windows-latest'
+    variables:
+      MUMBLE_ENVIRONMENT_VERSION: 'win32-static-1.4.x-2020-07-22-dbd6271-1162'
+      MUMBLE_ENVIRONMENT_TRIPLET: 'x86-windows-static-md'
+      VCVARS_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsamd64_x86.bat'
     steps:
     - template: steps_windows.yml
   - job: Linux
diff --git a/.ci/azure-pipelines/main.yml b/.ci/azure-pipelines/main.yml
index c68bcab61..2b4f2c28c 100644
--- a/.ci/azure-pipelines/main.yml
+++ b/.ci/azure-pipelines/main.yml
@@ -5,11 +5,24 @@ variables:
   MUMBLE_ENVIRONMENT_TOOLCHAIN: '$(MUMBLE_ENVIRONMENT_PATH)/scripts/buildsystems/vcpkg.cmake'
 
 jobs:
-  - job: Windows
+  - job: Windows_x86_64
+    displayName: Windows (x86_64)
     pool:
       vmImage: 'windows-latest'
     variables:
       MUMBLE_ENVIRONMENT_VERSION: 'win64-static-1.4.x-2020-05-27-ecb3c64-1151'
+      MUMBLE_ENVIRONMENT_TRIPLET: 'x64-windows-static-md'
+      VCVARS_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat'
+    steps:
+    - template: steps_windows.yml
+  - job: Windows_x86
+    displayName: Windows (x86)
+    pool:
+      vmImage: 'windows-latest'
+    variables:
+      MUMBLE_ENVIRONMENT_VERSION: 'win32-static-1.4.x-2020-07-22-dbd6271-1162'
+      MUMBLE_ENVIRONMENT_TRIPLET: 'x86-windows-static-md'
+      VCVARS_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsamd64_x86.bat'
     steps:
     - template: steps_windows.yml
   - job: Linux