Skip to content

Commit fe5ebc3

Browse files
authored
Download redistributable VC files from cpython-bin-deps (#63)
Previously we would use whichever was installed on the build machine, which could result in downgrades between releases. See python/cpython#110437 for more information about what this breaks.
1 parent 6a977f3 commit fe5ebc3

File tree

3 files changed

+13
-0
lines changed

3 files changed

+13
-0
lines changed

windows-release/acquire-vcruntime.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
parameters:
2+
Remote: https://github.com/python/cpython-bin-deps
3+
Ref: vcruntime
4+
5+
steps:
6+
- powershell: |
7+
git clone --progress -v --depth 1 --branch ${{ parameters.Ref }} --single-branch ${{ parameters.Remote }} vcruntime
8+
$files = (dir "vcruntime\$(arch)\*.dll").FullName -join ";"
9+
"##vso[task.setvariable variable=VCRuntimeDLL]$files"
10+
displayName: 'Import VC redist'

windows-release/build-steps-pgo.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ steps:
77
- template: ./checkout.yml
88

99
- ${{ if or(eq(parameters.PGInstrument, 'true'), eq(parameters.PGUpdate, 'true')) }}:
10+
- template: ./acquire-vcruntime.yml
11+
1012
- powershell: |
1113
$d = (.\PCbuild\build.bat -V) | %{ if($_ -match '\s+(\w+):\s*(.+)\s*$') { @{$Matches[1] = $Matches[2];} }};
1214
Write-Host "##vso[task.setvariable variable=VersionText]$($d.PythonVersion)"

windows-release/build-steps.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ parameters:
33

44
steps:
55
- template: ./checkout.yml
6+
- template: ./acquire-vcruntime.yml
67

78
- powershell: |
89
$d = (.\PCbuild\build.bat -V) | %{ if($_ -match '\s+(\w+):\s*(.+)\s*$') { @{$Matches[1] = $Matches[2];} }};

0 commit comments

Comments
 (0)