From 3d766775948fefa9ffe6e564dce844b24e2f11e0 Mon Sep 17 00:00:00 2001
From: glx22 <glx@openttd.org>
Date: Sun, 7 Jun 2020 04:34:50 +0200
Subject: Fix: Generate windows installer only for stable releases

---
 azure-pipelines/templates/release.yml       | 2 ++
 azure-pipelines/templates/windows-build.yml | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'azure-pipelines')

diff --git a/azure-pipelines/templates/release.yml b/azure-pipelines/templates/release.yml
index 60e2ff5fd..9c126a8f3 100644
--- a/azure-pipelines/templates/release.yml
+++ b/azure-pipelines/templates/release.yml
@@ -90,6 +90,8 @@ jobs:
       BuildArch: $(BuildArch)
       VcpkgTargetTriplet: $(VcpkgTargetTriplet)
       BuildConfiguration: 'RelWithDebInfo'
+      ${{ if eq(parameters.IsStableRelease, true) }}:
+        OptionUseNSIS: "YES"
   - task: VSBuild@1
     displayName: 'Create bundles'
     inputs:
diff --git a/azure-pipelines/templates/windows-build.yml b/azure-pipelines/templates/windows-build.yml
index fccf62d7b..07e42a7ce 100644
--- a/azure-pipelines/templates/windows-build.yml
+++ b/azure-pipelines/templates/windows-build.yml
@@ -2,12 +2,13 @@ parameters:
   BuildArch: ''
   VcpkgTargetTriplet: ''
   BuildConfiguration: ''
+  OptionUseNSIS: 'NO'
 
 steps:
 - task: CMake@1
   displayName: 'Configure'
   inputs:
-    cmakeArgs: '.. -G "Visual Studio 15 2017" -A ${{ parameters.BuildArch }} -DCMAKE_TOOLCHAIN_FILE="c:\vcpkg\scripts\buildsystems\vcpkg.cmake" -DVCPKG_TARGET_TRIPLET="${{ parameters.VcpkgTargetTriplet }}"'
+    cmakeArgs: '.. -G "Visual Studio 15 2017" -A ${{ parameters.BuildArch }} -DCMAKE_TOOLCHAIN_FILE="c:\vcpkg\scripts\buildsystems\vcpkg.cmake" -DVCPKG_TARGET_TRIPLET="${{ parameters.VcpkgTargetTriplet }}" -DOPTION_USE_NSIS="${{ parameters.OptionUseNSIS }}"'
 - task: VSBuild@1
   displayName: 'Build'
   inputs:
-- 
cgit v1.2.3-54-g00ecf