diff options
| author | Steve Dower <steve.dower@python.org> | 2019-06-14 14:19:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-14 14:19:25 -0700 |
| commit | 749e73065dea1cc3a6d39a830380a2c124f568c2 (patch) | |
| tree | 627cdd16741b55c2da50bf920849976bca1cad4c /.azure-pipelines | |
| parent | bd5798f6d4f6960fd6b49976bdf4326be77f4277 (diff) | |
| download | cpython-git-749e73065dea1cc3a6d39a830380a2c124f568c2.tar.gz | |
Fix Windows release build issues (GH-14091)
* Increase timeout for PGO builds in Windows release
* Fix test step failures
* Disable MinGW step properly
* Fix embeddable distro name
Diffstat (limited to '.azure-pipelines')
4 files changed, 14 insertions, 6 deletions
diff --git a/.azure-pipelines/windows-release/msi-steps.yml b/.azure-pipelines/windows-release/msi-steps.yml index 2f80c34eeb..153408271c 100644 --- a/.azure-pipelines/windows-release/msi-steps.yml +++ b/.azure-pipelines/windows-release/msi-steps.yml @@ -94,8 +94,8 @@ steps: Py_OutDir: $(Build.BinariesDirectory) - script: | - %MSBUILD% Tools\msi\bundle\releaselocal.wixproj /t:Rebuild /p:RebuildAll=true /p:BuildForRelease=true - %MSBUILD% Tools\msi\bundle\releaseweb.wixproj /t:Rebuild /p:RebuildAll=false /p:BuildForRelease=true + %MSBUILD% Tools\msi\bundle\releaselocal.wixproj /t:Rebuild /p:RebuildAll=true + %MSBUILD% Tools\msi\bundle\releaseweb.wixproj /t:Rebuild /p:RebuildAll=false displayName: 'Build win32 installer' env: Platform: x86 @@ -103,10 +103,12 @@ steps: PYTHON: $(Build.BinariesDirectory)\win32\python.exe PYTHONHOME: $(Build.SourcesDirectory) TclTkLibraryDir: $(Build.BinariesDirectory)\tcltk_lib_win32 + BuildForRelease: true + SuppressMinGWLib: true - script: | - %MSBUILD% Tools\msi\bundle\releaselocal.wixproj /t:Rebuild /p:RebuildAll=true /p:BuildForRelease=true - %MSBUILD% Tools\msi\bundle\releaseweb.wixproj /t:Rebuild /p:RebuildAll=false /p:BuildForRelease=true + %MSBUILD% Tools\msi\bundle\releaselocal.wixproj /t:Rebuild /p:RebuildAll=true + %MSBUILD% Tools\msi\bundle\releaseweb.wixproj /t:Rebuild /p:RebuildAll=false displayName: 'Build amd64 installer' env: Platform: x64 @@ -114,6 +116,8 @@ steps: PYTHON: $(Build.BinariesDirectory)\amd64\python.exe PYTHONHOME: $(Build.SourcesDirectory) TclTkLibraryDir: $(Build.BinariesDirectory)\tcltk_lib_amd64 + BuildForRelease: true + SuppressMinGWLib: true - task: CopyFiles@2 displayName: 'Assemble artifact: msi (1/2)' diff --git a/.azure-pipelines/windows-release/stage-build.yml b/.azure-pipelines/windows-release/stage-build.yml index 121e4b1a27..a5093a04f0 100644 --- a/.azure-pipelines/windows-release/stage-build.yml +++ b/.azure-pipelines/windows-release/stage-build.yml @@ -95,6 +95,9 @@ jobs: displayName: Python PGO build condition: and(succeeded(), eq(variables['DoPGO'], 'true')) + # Allow up to five hours for PGO + timeoutInMinutes: 300 + pool: name: 'Windows Release' diff --git a/.azure-pipelines/windows-release/stage-layout-embed.yml b/.azure-pipelines/windows-release/stage-layout-embed.yml index c9d58b6b30..e2689dbb60 100644 --- a/.azure-pipelines/windows-release/stage-layout-embed.yml +++ b/.azure-pipelines/windows-release/stage-layout-embed.yml @@ -39,7 +39,7 @@ jobs: - powershell: > $(LayoutCmd) --copy "$(Build.ArtifactStagingDirectory)\layout" - --zip "$(Build.ArtifactStagingDirectory)\embed\$(VersionText)-embed-$(Name).zip" + --zip "$(Build.ArtifactStagingDirectory)\embed\python-$(VersionText)-embed-$(Name).zip" --preset-embed displayName: 'Generate embeddable layout' diff --git a/.azure-pipelines/windows-release/stage-test-embed.yml b/.azure-pipelines/windows-release/stage-test-embed.yml index ab377fdfa8..b33176266a 100644 --- a/.azure-pipelines/windows-release/stage-test-embed.yml +++ b/.azure-pipelines/windows-release/stage-test-embed.yml @@ -26,7 +26,8 @@ jobs: downloadPath: $(Build.BinariesDirectory) - powershell: | - Expand-Archive -Path "$(Build.BinariesDirectory)\embed\embed-$(Name).zip" -DestinationPath "$(Build.BinariesDirectory)\Python" + $p = gi "$(Build.BinariesDirectory)\embed\python*embed-$(Name).zip" + Expand-Archive -Path $p -DestinationPath "$(Build.BinariesDirectory)\Python" $p = gi "$(Build.BinariesDirectory)\Python\python.exe" Write-Host "##vso[task.prependpath]$(Split-Path -Parent $p)" displayName: 'Install Python and add to PATH' |