diff options
| author | Steve Dower <steve.dower@python.org> | 2022-03-22 01:08:37 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-22 01:08:37 (GMT) |
| commit | 3751b6b030b4a3b88959b4f3c4ef2e58d325e497 (patch) | |
| tree | 2e88aeafa9c1e99c1ab33ec0ec4d4c92bb061517 /.azure-pipelines/windows-release | |
| parent | 19058b9f6271338bcc46b7d30fe79a83990cc35c (diff) | |
| download | cpython-3751b6b030b4a3b88959b4f3c4ef2e58d325e497.zip cpython-3751b6b030b4a3b88959b4f3c4ef2e58d325e497.tar.gz cpython-3751b6b030b4a3b88959b4f3c4ef2e58d325e497.tar.bz2 | |
bpo-47086: Remove .chm from Windows installer and add HTML docs (GH-32038)
Diffstat (limited to '.azure-pipelines/windows-release')
4 files changed, 12 insertions, 9 deletions
diff --git a/.azure-pipelines/windows-release/gpg-sign.yml b/.azure-pipelines/windows-release/gpg-sign.yml index 0855af8..04206d2 100644 --- a/.azure-pipelines/windows-release/gpg-sign.yml +++ b/.azure-pipelines/windows-release/gpg-sign.yml @@ -3,12 +3,14 @@ parameters: GPGPassphrase: $(GPGPassphrase) Files: '*' WorkingDirectory: $(Build.BinariesDirectory) + Condition: succeeded() steps: - task: DownloadSecureFile@1 name: gpgkey inputs: secureFile: ${{ parameters.GPGKeyFile }} + condition: ${{ parameters.Condition }} displayName: 'Download GPG key' - powershell: | @@ -18,6 +20,7 @@ steps: gpg/gpg2.exe -ba --batch --passphrase ${{ parameters.GPGPassphrase }} $_ "Made signature for $_" } + condition: ${{ parameters.Condition }} displayName: 'Generate GPG signatures' workingDirectory: ${{ parameters.WorkingDirectory }} diff --git a/.azure-pipelines/windows-release/msi-steps.yml b/.azure-pipelines/windows-release/msi-steps.yml index c3c2c43..79fc6f5 100644 --- a/.azure-pipelines/windows-release/msi-steps.yml +++ b/.azure-pipelines/windows-release/msi-steps.yml @@ -21,8 +21,6 @@ steps: inputs: sourceFolder: $(Build.BinariesDirectory)\doc targetFolder: $(Build.SourcesDirectory)\Doc\build - contents: | - htmlhelp\*.chm - task: DownloadPipelineArtifact@1 displayName: 'Download artifact: bin_win32' diff --git a/.azure-pipelines/windows-release/stage-build.yml b/.azure-pipelines/windows-release/stage-build.yml index 2745d79..26f4317 100644 --- a/.azure-pipelines/windows-release/stage-build.yml +++ b/.azure-pipelines/windows-release/stage-build.yml @@ -5,7 +5,6 @@ jobs: - job: Build_Docs displayName: Docs build pool: - #name: 'Windows Release' vmImage: windows-2022 workspace: @@ -21,14 +20,10 @@ jobs: - script: Doc\make.bat htmlhelp displayName: 'Build CHM docs' + condition: and(succeeded(), eq(variables['DoCHM'], 'true')) env: BUILDDIR: $(Build.BinariesDirectory)\Doc - #- powershell: | - # mkdir -Force "$(Build.BinariesDirectory)\Doc\htmlhelp" - # iwr "https://www.python.org/ftp/python/3.8.0/python380.chm" -OutFile "$(Build.BinariesDirectory)\Doc\htmlhelp\python390a0.chm" - # displayName: 'Cheat at building CHM docs' - - task: CopyFiles@2 displayName: 'Assemble artifact: Doc' inputs: @@ -44,6 +39,7 @@ jobs: targetPath: $(Build.ArtifactStagingDirectory)\Doc artifactName: doc + - job: Build_Python displayName: Python build diff --git a/.azure-pipelines/windows-release/stage-publish-pythonorg.yml b/.azure-pipelines/windows-release/stage-publish-pythonorg.yml index 953f728..ee50e4e 100644 --- a/.azure-pipelines/windows-release/stage-publish-pythonorg.yml +++ b/.azure-pipelines/windows-release/stage-publish-pythonorg.yml @@ -87,7 +87,13 @@ jobs: - template: ./gpg-sign.yml parameters: GPGKeyFile: 'python-signing.key' - Files: 'doc\htmlhelp\*.chm, msi\*\*, embed\*.zip' + Files: 'msi\*\*, embed\*.zip' + + - template: ./gpg-sign.yml + parameters: + GPGKeyFile: 'python-signing.key' + Files: 'doc\htmlhelp\*.chm' + Condition: and(succeeded(), eq(variables['DoCHM'], 'true')) - powershell: > $(Build.SourcesDirectory)\Tools\msi\uploadrelease.ps1 |