From dd31b119ae07e2f0a25bc178a5088ad8f212b8e5 Mon Sep 17 00:00:00 2001
From: Robert Adam <dev@robert-adam.de>
Date: Mon, 3 Aug 2020 18:06:44 +0200
Subject: CI(azure): Don't overwrite build artifacts

As of now the built x86 files overwrite the x64 ones since the x64
build is usually done first but they both produce files of the same
name.

With this commit the build artifacts for x86 and x64 are separated.
---
 .ci/azure-pipelines/main-pr.yml       | 4 ++++
 .ci/azure-pipelines/main.yml          | 4 ++++
 .ci/azure-pipelines/steps_windows.yml | 4 ++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.ci/azure-pipelines/main-pr.yml b/.ci/azure-pipelines/main-pr.yml
index 86ead2a7b..ce1924584 100644
--- a/.ci/azure-pipelines/main-pr.yml
+++ b/.ci/azure-pipelines/main-pr.yml
@@ -15,6 +15,8 @@ jobs:
       VCVARS_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat'
     steps:
     - template: steps_windows.yml
+      parameters:
+        arch: 'x64'
   - job: Windows_x86
     displayName: Windows (x86)
     pool:
@@ -25,6 +27,8 @@ jobs:
       VCVARS_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsamd64_x86.bat'
     steps:
     - template: steps_windows.yml
+      parameters:
+        arch: 'x86'
   - job: Linux
     pool:
       vmImage: 'ubuntu-16.04'
diff --git a/.ci/azure-pipelines/main.yml b/.ci/azure-pipelines/main.yml
index 2b4f2c28c..dba7474fa 100644
--- a/.ci/azure-pipelines/main.yml
+++ b/.ci/azure-pipelines/main.yml
@@ -15,6 +15,8 @@ jobs:
       VCVARS_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat'
     steps:
     - template: steps_windows.yml
+      parameters:
+        arch: 'x64'
   - job: Windows_x86
     displayName: Windows (x86)
     pool:
@@ -25,6 +27,8 @@ jobs:
       VCVARS_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsamd64_x86.bat'
     steps:
     - template: steps_windows.yml
+      parameters:
+        arch: 'x86'
   - job: Linux
     pool:
       vmImage: 'ubuntu-16.04'
diff --git a/.ci/azure-pipelines/steps_windows.yml b/.ci/azure-pipelines/steps_windows.yml
index 7a60c7321..ef620f34d 100644
--- a/.ci/azure-pipelines/steps_windows.yml
+++ b/.ci/azure-pipelines/steps_windows.yml
@@ -8,11 +8,11 @@ steps:
     displayName: 'Build'
   - powershell: |
       cd $(Build.BinariesDirectory)
-      .\Create-Win32InstallerMUI.ps1 -PackageName 'Mumble' -Version '1.4.0'
+      .\Create-Win32InstallerMUI.ps1 -PackageName 'Mumble_${{parameters.arch}}' -Version '1.4.0'
       cp *.sha* $(Build.ArtifactStagingDirectory)
       cp *.msi $(Build.ArtifactStagingDirectory)
       cp *.pdb $(Build.ArtifactStagingDirectory)
     displayName: Build installer
   - template: task-publish-artifacts.yml
     parameters:
-      name: "Windows installer"
+      name: 'Windows (${{parameters.arch}}) installer'
-- 
cgit v1.2.3