Skip to content

Commit d67b847

Browse files
committed
Ensure SigningCertificate variable is set so that WiX detects it
1 parent 1fdf676 commit d67b847

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

windows-release/azure-pipelines.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,10 @@ parameters:
8585
displayName: "Produce EXE/MSI installer"
8686
type: boolean
8787
default: true
88+
- name: TestMSI
89+
displayName: "Run EXE/MSI installer tests"
90+
type: boolean
91+
default: true
8892
- name: DoPyManager
8993
displayName: "Produce PyManager package"
9094
type: boolean
@@ -248,7 +252,7 @@ stages:
248252
jobs:
249253
- ${{ if eq(parameters.DoEmbed, 'true') }}:
250254
- template: stage-test-embed.yml
251-
- ${{ if eq(parameters.DoMSI, 'true') }}:
255+
- ${{ if and(eq(parameters.DoMSI, 'true'), eq(parameters.TestMSI, 'true')) }}:
252256
- template: stage-test-msi.yml
253257
parameters:
254258
DoFreethreaded: ${{ parameters.DoFreethreaded }}

windows-release/msi-steps.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ steps:
8585
AZURE_TENANT_ID: $(TrustedSigningTenantId)
8686
AZURE_CLIENT_ID: $(TrustedSigningClientId)
8787
AZURE_CLIENT_SECRET: $(TrustedSigningSecret)
88+
# Only need the variable here for msi.props to detect
89+
SigningCertificate: ${{ parameters.SigningCertificate }}
8890
8991
- ${{ each b in parameters.Bundles }}:
9092
- script: |
@@ -101,6 +103,8 @@ steps:
101103
AZURE_TENANT_ID: $(TrustedSigningTenantId)
102104
AZURE_CLIENT_ID: $(TrustedSigningClientId)
103105
AZURE_CLIENT_SECRET: $(TrustedSigningSecret)
106+
# Only need the variable here for msi.props to detect
107+
SigningCertificate: ${{ parameters.SigningCertificate }}
104108
105109
- powershell: |
106110
del $env:ResponseFile -ErrorAction Continue

0 commit comments

Comments
 (0)