Fix Windows release builds (GH-17550)

This commit is contained in:
Steve Dower 2019-12-09 21:10:22 -08:00 committed by GitHub
parent e9df88e8e9
commit abdeb57a21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions

View File

@ -43,7 +43,7 @@ steps:
- powershell: | - powershell: |
$env:SigningCertificate = $null $env:SigningCertificate = $null
python PC\layout -vv -b "$(Build.BinariesDirectory)\bin" -t "$(Build.BinariesDirectory)\catalog" --catalog "${env:CAT}.cdf" --preset-default --arch $(Arch) $(_HostPython) PC\layout -vv -b "$(Build.BinariesDirectory)\bin" -t "$(Build.BinariesDirectory)\catalog" --catalog "${env:CAT}.cdf" --preset-default --arch $(Arch)
makecat "${env:CAT}.cdf" makecat "${env:CAT}.cdf"
del "${env:CAT}.cdf" del "${env:CAT}.cdf"
if (-not (Test-Path "${env:CAT}.cat")) { if (-not (Test-Path "${env:CAT}.cat")) {

View File

@ -57,26 +57,31 @@ jobs:
Arch: win32 Arch: win32
Platform: x86 Platform: x86
Configuration: Release Configuration: Release
_HostPython: .\python
win32_d: win32_d:
Name: win32_d Name: win32_d
Arch: win32 Arch: win32
Platform: x86 Platform: x86
Configuration: Debug Configuration: Debug
_HostPython: .\python
amd64_d: amd64_d:
Name: amd64_d Name: amd64_d
Arch: amd64 Arch: amd64
Platform: x64 Platform: x64
Configuration: Debug Configuration: Debug
_HostPython: .\python
arm64: arm64:
Name: arm64 Name: arm64
Arch: arm64 Arch: arm64
Platform: ARM64 Platform: ARM64
Configuration: Release Configuration: Release
_HostPython: python
arm64_d: arm64_d:
Name: arm64_d Name: arm64_d
Arch: arm64 Arch: arm64
Platform: ARM64 Platform: ARM64
Configuration: Debug Configuration: Debug
_HostPython: python
steps: steps:
- template: ./build-steps.yml - template: ./build-steps.yml
@ -98,6 +103,7 @@ jobs:
Arch: amd64 Arch: amd64
Platform: x64 Platform: x64
Configuration: Release Configuration: Release
_HostPython: .\python
steps: steps:
- template: ./build-steps.yml - template: ./build-steps.yml
@ -123,6 +129,7 @@ jobs:
Arch: amd64 Arch: amd64
Platform: x64 Platform: x64
Configuration: Release Configuration: Release
_HostPython: .\python
steps: steps:
- template: ./build-steps.yml - template: ./build-steps.yml