From 35bcf9f3c19dfbb368c08e3aa75fda72a23c030d Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Wed, 6 Apr 2022 11:55:47 +0100 Subject: Fix generation of MD5 table at end of Windows release build (GH-32345) --- .../windows-release/stage-publish-pythonorg.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.azure-pipelines/windows-release/stage-publish-pythonorg.yml b/.azure-pipelines/windows-release/stage-publish-pythonorg.yml index e8f12b6..084134e 100644 --- a/.azure-pipelines/windows-release/stage-publish-pythonorg.yml +++ b/.azure-pipelines/windows-release/stage-publish-pythonorg.yml @@ -135,7 +135,7 @@ jobs: - powershell: | $failures = 0 - gci "msi\*\*-webinstall.exe" -File | %{ + gci "msi\*\*.exe" -File | %{ $d = mkdir "tests\$($_.BaseName)" -Force gci $d -r -File | del $ic = copy $_ $d -PassThru @@ -155,7 +155,11 @@ jobs: displayName: 'Test layouts' - powershell: | - $hashes = gci doc\htmlhelp\python*.chm, msi\*\*.exe, embed\*.zip | ` + $files = gci -File "msi\*\*.exe", "embed\*.zip" + if ("$(DoCHM)" -ieq "true") { + $files = $files + (gci -File "doc\htmlhelp\python*.chm") + } + $hashes = $files | ` Sort-Object Name | ` Format-Table Name, @{ Label="MD5"; @@ -170,9 +174,13 @@ jobs: - powershell: | "Copying:" - (gci msi\*\python*.asc, doc\htmlhelp\*.asc, embed\*.asc).FullName + $files = gci -File "msi\*\python*.asc", "embed\*.asc" + if ("$(DoCHM)" -ieq "true") { + $files = $files + (gci -File "doc\htmlhelp\*.asc") + } + $files.FullName $d = mkdir "$(Build.ArtifactStagingDirectory)\hashes" -Force - move msi\*\python*.asc, doc\htmlhelp\*.asc, embed\*.asc $d -Force + move $files $d -Force gci msi -Directory | %{ move "msi\$_\*.asc" (mkdir "$d\$_" -Force) } workingDirectory: $(Build.BinariesDirectory) displayName: 'Copy GPG signatures for build' -- cgit v0.12