summaryrefslogtreecommitdiff
path: root/azure-pipelines
diff options
context:
space:
mode:
authorglx22 <glx@openttd.org>2020-06-07 04:34:50 +0200
committerCharles Pigott <charlespigott@googlemail.com>2020-06-08 09:49:26 +0100
commit3d766775948fefa9ffe6e564dce844b24e2f11e0 (patch)
treeca45a86ac04eaf23f0eecf7c97111e2067c3aebd /azure-pipelines
parentf51e66f697e2956d57671afd90a57ca932356756 (diff)
downloadopenttd-3d766775948fefa9ffe6e564dce844b24e2f11e0.tar.xz
Fix: Generate windows installer only for stable releases
Diffstat (limited to 'azure-pipelines')
-rw-r--r--azure-pipelines/templates/release.yml2
-rw-r--r--azure-pipelines/templates/windows-build.yml3
2 files changed, 4 insertions, 1 deletions
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: