From bd3196f91228dbf1ae643bcceeeb731b7dba7290 Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Mon, 9 Dec 2019 16:47:54 -0800 Subject: [PATCH 1/2] Only override host Python on ARM builds --- .azure-pipelines/windows-release/build-steps.yml | 2 +- .azure-pipelines/windows-release/stage-build.yml | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.azure-pipelines/windows-release/build-steps.yml b/.azure-pipelines/windows-release/build-steps.yml index e2b6683f46e3c3e..5ca2016d65f9e1e 100644 --- a/.azure-pipelines/windows-release/build-steps.yml +++ b/.azure-pipelines/windows-release/build-steps.yml @@ -43,7 +43,7 @@ steps: - powershell: | $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" del "${env:CAT}.cdf" if (-not (Test-Path "${env:CAT}.cat")) { diff --git a/.azure-pipelines/windows-release/stage-build.yml b/.azure-pipelines/windows-release/stage-build.yml index 60d72b282d1e511..70653c334659f74 100644 --- a/.azure-pipelines/windows-release/stage-build.yml +++ b/.azure-pipelines/windows-release/stage-build.yml @@ -57,26 +57,31 @@ jobs: Arch: win32 Platform: x86 Configuration: Release + _HostPython: .\python.exe win32_d: Name: win32_d Arch: win32 Platform: x86 Configuration: Debug + _HostPython: .\python.exe amd64_d: Name: amd64_d Arch: amd64 Platform: x64 Configuration: Debug + _HostPython: .\python.exe arm64: Name: arm64 Arch: arm64 Platform: ARM64 Configuration: Release + _HostPython: python.exe arm64_d: Name: arm64_d Arch: arm64 Platform: ARM64 Configuration: Debug + _HostPython: python.exe steps: - template: ./build-steps.yml @@ -98,6 +103,7 @@ jobs: Arch: amd64 Platform: x64 Configuration: Release + _HostPython: .\python.exe steps: - template: ./build-steps.yml @@ -123,6 +129,7 @@ jobs: Arch: amd64 Platform: x64 Configuration: Release + _HostPython: .\python.exe steps: - template: ./build-steps.yml From 2e3a7a6b417ea5e4a1cf007d46e4a217327f586e Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Mon, 9 Dec 2019 16:55:40 -0800 Subject: [PATCH 2/2] Remove incorrect .exe suffixes --- .azure-pipelines/windows-release/stage-build.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.azure-pipelines/windows-release/stage-build.yml b/.azure-pipelines/windows-release/stage-build.yml index 70653c334659f74..9391a91e30b5e68 100644 --- a/.azure-pipelines/windows-release/stage-build.yml +++ b/.azure-pipelines/windows-release/stage-build.yml @@ -57,31 +57,31 @@ jobs: Arch: win32 Platform: x86 Configuration: Release - _HostPython: .\python.exe + _HostPython: .\python win32_d: Name: win32_d Arch: win32 Platform: x86 Configuration: Debug - _HostPython: .\python.exe + _HostPython: .\python amd64_d: Name: amd64_d Arch: amd64 Platform: x64 Configuration: Debug - _HostPython: .\python.exe + _HostPython: .\python arm64: Name: arm64 Arch: arm64 Platform: ARM64 Configuration: Release - _HostPython: python.exe + _HostPython: python arm64_d: Name: arm64_d Arch: arm64 Platform: ARM64 Configuration: Debug - _HostPython: python.exe + _HostPython: python steps: - template: ./build-steps.yml @@ -103,7 +103,7 @@ jobs: Arch: amd64 Platform: x64 Configuration: Release - _HostPython: .\python.exe + _HostPython: .\python steps: - template: ./build-steps.yml @@ -129,7 +129,7 @@ jobs: Arch: amd64 Platform: x64 Configuration: Release - _HostPython: .\python.exe + _HostPython: .\python steps: - template: ./build-steps.yml