Skip to content

Commit 2ef6f26

Browse files
committed
Fix real publishing steps for Windows releases
1 parent 53a5424 commit 2ef6f26

2 files changed

Lines changed: 8 additions & 4 deletions

File tree

windows-release/merge-and-upload.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,12 @@ def install_sortkey(install):
278278

279279

280280
def find_missing_from_index(url, installs):
281+
if not UPLOAD_HOST:
282+
print("Skipping check for upload race because UPLOAD_HOST is missing")
283+
return []
284+
if NO_UPLOAD:
285+
print("Skipping check for upload race because NO_UPLOAD is set")
286+
return []
281287
with urlopen(url) as r:
282288
x = {install_sortkey(i) for i in json.load(r)["versions"]}
283289
y = {install_sortkey(i) for i in installs} - x

windows-release/msi-steps.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,8 @@ steps:
7777
Include: ''
7878
ExportCommand: SignCommand
7979
SigningCertificate: ${{ parameters.SigningCertificate }}
80-
# WiX is struggling with WIF authentication and sign.exe right now,
81-
# so we still rely on the client secret for legacy builds.
82-
# We disable the service connection here to skip the login steps.
83-
AzureServiceConnectionName: ''
80+
# WiX never moved on from signtool.exe, so we'll use that here
81+
InstallLegacyTool: true
8482

8583
- powershell: |
8684
$cmd = $env:SignCommand -replace '"', '\"'

0 commit comments

Comments
 (0)