Skip to content

Commit a6512b3

Browse files
authored
Fix Windows release build (#97)
Signed builds were not including free-threaded binaries in the installer Nuget packages need to be signed separately, not by wildcard
1 parent d29c9c3 commit a6512b3

3 files changed

Lines changed: 15 additions & 6 deletions

File tree

windows-release/sign-nuget-files.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,13 @@ steps:
1919
} else {
2020
$files = (gi ${{ parameters.Include }})
2121
}
22-
NuGetKeyVaultSignTool sign -kvu '$(KeyVaultUri)' `
23-
-kvi '$(KeyVaultApplication)' -kvt '$(KeyVaultDirectory)' -kvs '$(KeyVaultSecret)' `
24-
-tr http://timestamp.digicert.com/ -td sha256 `
25-
-kvc '${{ parameters.SigningCertificate }}' -fd sha256 `
26-
$files
22+
$files | %{
23+
NuGetKeyVaultSignTool sign -kvu '$(KeyVaultUri)' `
24+
-kvi '$(KeyVaultApplication)' -kvt '$(KeyVaultDirectory)' -kvs '$(KeyVaultSecret)' `
25+
-tr http://timestamp.digicert.com/ -td sha256 `
26+
-kvc '${{ parameters.SigningCertificate }}' -fd sha256 `
27+
$_
28+
}
2729
displayName: 'Sign binaries'
2830
retryCountOnTaskFailure: 3
2931
workingDirectory: ${{ parameters.WorkingDir }}

windows-release/stage-msi.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ jobs:
2727
- template: msi-steps.yml
2828
parameters:
2929
ARM64TclTk: ${{ parameters.ARM64TclTk }}
30+
DoFreethreaded: ${{ parameters.DoFreethreaded }}
3031
SigningCertificate: ${{ parameters.SigningCertificate }}
3132

3233

windows-release/stage-test-msi.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,13 @@ jobs:
8686
- powershell: |
8787
$p = (gci "$(Build.BinariesDirectory)\Python\python3*t.exe" | select -First 1)
8888
Write-Host "Found $p"
89-
& $p -c "import sys; print(sys.version)"
89+
if (-not $p) {
90+
Write-Host "Did not find python3*t.exe in:"
91+
dir "$(Build.BinariesDirectory)\Python"
92+
throw "Free-threaded binaries were not installed"
93+
} else {
94+
& $p -c "import sys; print(sys.version)"
95+
}
9096
displayName: 'Collect free-threaded version number'
9197
condition: and(succeeded(), not(variables['SkipTests']))
9298

0 commit comments

Comments
 (0)