aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@python.org>2020-08-06 17:36:22 +0100
committerGitHub <noreply@github.com>2020-08-06 17:36:22 +0100
commit777b611c8c5676b80898a429f71d28e59bddc49d (patch)
tree427e0d43932c3c27f4bf573cd9c41d5d4e21fae4 /.azure-pipelines
parentbpo-40275: Use new test.support helper submodules in tests (GH-21743) (diff)
downloadcpython-777b611c8c5676b80898a429f71d28e59bddc49d.tar.gz
cpython-777b611c8c5676b80898a429f71d28e59bddc49d.tar.bz2
cpython-777b611c8c5676b80898a429f71d28e59bddc49d.zip
bpo-41492: Fixes the description appearing in UAC prompts on Windows (GH-21754)
Diffstat (limited to '.azure-pipelines')
-rw-r--r--.azure-pipelines/windows-release/msi-steps.yml6
-rw-r--r--.azure-pipelines/windows-release/stage-pack-msix.yml8
-rw-r--r--.azure-pipelines/windows-release/stage-sign.yml6
3 files changed, 19 insertions, 1 deletions
diff --git a/.azure-pipelines/windows-release/msi-steps.yml b/.azure-pipelines/windows-release/msi-steps.yml
index a460eb1bac8..307510a40dd 100644
--- a/.azure-pipelines/windows-release/msi-steps.yml
+++ b/.azure-pipelines/windows-release/msi-steps.yml
@@ -1,6 +1,12 @@
steps:
- template: ./checkout.yml
+ - powershell: |
+ $d = (.\PCbuild\build.bat -V) | %{ if($_ -match '\s+(\w+):\s*(.+)\s*$') { @{$Matches[1] = $Matches[2];} }};
+ Write-Host "##vso[task.setvariable variable=SigningDescription]Python $($d.PythonVersion)"
+ displayName: 'Update signing description'
+ condition: and(succeeded(), not(variables['SigningDescription']))
+
- task: DownloadPipelineArtifact@1
displayName: 'Download artifact: doc'
inputs:
diff --git a/.azure-pipelines/windows-release/stage-pack-msix.yml b/.azure-pipelines/windows-release/stage-pack-msix.yml
index 07e343a0b4e..26a5712e845 100644
--- a/.azure-pipelines/windows-release/stage-pack-msix.yml
+++ b/.azure-pipelines/windows-release/stage-pack-msix.yml
@@ -105,9 +105,15 @@ jobs:
clean: all
steps:
- - checkout: none
+ - template: ./checkout.yml
- template: ./find-sdk.yml
+ - powershell: |
+ $d = (.\PCbuild\build.bat -V) | %{ if($_ -match '\s+(\w+):\s*(.+)\s*$') { @{$Matches[1] = $Matches[2];} }};
+ Write-Host "##vso[task.setvariable variable=SigningDescription]Python $($d.PythonVersion)"
+ displayName: 'Update signing description'
+ condition: and(succeeded(), not(variables['SigningDescription']))
+
- task: DownloadBuildArtifacts@0
displayName: 'Download Artifact: unsigned_msix'
inputs:
diff --git a/.azure-pipelines/windows-release/stage-sign.yml b/.azure-pipelines/windows-release/stage-sign.yml
index 4d757ae8fca..584772af8b4 100644
--- a/.azure-pipelines/windows-release/stage-sign.yml
+++ b/.azure-pipelines/windows-release/stage-sign.yml
@@ -27,6 +27,12 @@ jobs:
- template: ./find-sdk.yml
- powershell: |
+ $d = (.\PCbuild\build.bat -V) | %{ if($_ -match '\s+(\w+):\s*(.+)\s*$') { @{$Matches[1] = $Matches[2];} }};
+ Write-Host "##vso[task.setvariable variable=SigningDescription]Python $($d.PythonVersion)"
+ displayName: 'Update signing description'
+ condition: and(succeeded(), not(variables['SigningDescription']))
+
+ - powershell: |
Write-Host "##vso[build.addbuildtag]signed"
displayName: 'Add build tags'