Skip to content

Commit ef14a4f

Browse files
zoobazooba
committed
Pass parameter differently
1 parent b3fe9b6 commit ef14a4f

3 files changed

Lines changed: 46 additions & 31 deletions

File tree

‎windows-release/azure-pipelines.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ stages:
200200
TailCallingOption: ''
201201
${{ else }}:
202202
TailCallingOption: '--tail-call-interp'
203-
ArchSuffix: ${{ iif(eq(parameters.Post315OutputDir, 'true'), 't', '') }}
203+
Post315OutputDir: ${{ parameters.Post315OutputDir }}
204204

205205
- stage: Sign
206206
displayName: Sign binaries
@@ -275,7 +275,7 @@ stages:
275275
DoARM64: ${{ parameters.DoARM64}}
276276
DoFreethreaded: ${{ parameters.DoFreethreaded }}
277277
SigningCertificate: ${{ iif(eq(parameters.SigningCertificate, 'Unsigned'), '', parameters.SigningCertificate) }}
278-
ArchSuffix: ${{ iif(eq(parameters.Post315OutputDir, 'true'), 't', '') }}
278+
Post315OutputDir: ${{ parameters.Post315OutputDir }}
279279
- ${{ if eq(parameters.DoMSIX, 'true') }}:
280280
- template: stage-pack-msix.yml
281281
parameters:

‎windows-release/stage-build.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ parameters:
77
ExtraOptions: ''
88
ExtraOptionsFreethreaded: '--disable-gil'
99
TailCallingOption: ''
10-
ArchSuffix: ''
10+
Post315OutputDir: false
1111

1212
jobs:
1313
- job: Build_Docs
@@ -116,7 +116,7 @@ jobs:
116116
win32_t:
117117
Name: win32_t
118118
Arch: win32
119-
ArchDir: win32${{ parameters.ArchSuffix }}
119+
ArchDir: ${{ iif(eq(parameters.Post315OutputDir, 'true'), 'win32t', 'win32') }}
120120
Platform: x86
121121
Configuration: Release
122122
_HostPython: .\python
@@ -128,7 +128,7 @@ jobs:
128128
win32_td:
129129
Name: win32_td
130130
Arch: win32
131-
ArchDir: win32${{ parameters.ArchSuffix }}
131+
ArchDir: ${{ iif(eq(parameters.Post315OutputDir, 'true'), 'win32t', 'win32') }}
132132
Platform: x86
133133
Configuration: Debug
134134
_HostPython: .\python
@@ -138,7 +138,7 @@ jobs:
138138
amd64_t:
139139
Name: amd64_t
140140
Arch: amd64
141-
ArchDir: amd64${{ parameters.ArchSuffix }}
141+
ArchDir: ${{ iif(eq(parameters.Post315OutputDir, 'true'), 'amd64t', 'amd64') }}
142142
Platform: x64
143143
Configuration: Release
144144
_HostPython: .\python
@@ -150,7 +150,7 @@ jobs:
150150
amd64_td:
151151
Name: amd64_td
152152
Arch: amd64
153-
ArchDir: amd64${{ parameters.ArchSuffix }}
153+
ArchDir: ${{ iif(eq(parameters.Post315OutputDir, 'true'), 'amd64t', 'amd64') }}
154154
Platform: x64
155155
Configuration: Debug
156156
_HostPython: .\python
@@ -160,7 +160,7 @@ jobs:
160160
arm64_t:
161161
Name: arm64_t
162162
Arch: arm64
163-
ArchDir: arm64${{ parameters.ArchSuffix }}
163+
ArchDir: ${{ iif(eq(parameters.Post315OutputDir, 'true'), 'arm64t', 'arm64') }}
164164
Platform: ARM64
165165
Configuration: Release
166166
_HostPython: python
@@ -172,7 +172,7 @@ jobs:
172172
arm64_td:
173173
Name: arm64_td
174174
Arch: arm64
175-
ArchDir: arm64${{ parameters.ArchSuffix }}
175+
ArchDir: ${{ iif(eq(parameters.Post315OutputDir, 'true'), 'arm64t', 'arm64') }}
176176
Platform: ARM64
177177
Configuration: Debug
178178
_HostPython: python
@@ -209,10 +209,10 @@ jobs:
209209
amd64_t:
210210
Name: amd64_t
211211
Arch: amd64
212-
ArchDir: amd64${{ parameters.ArchSuffix }}
212+
ArchDir: ${{ iif(eq(parameters.Post315OutputDir, 'true'), 'amd64t', 'amd64') }}
213213
Platform: x64
214214
_HostPython: .\python
215-
PythonExePattern: python3*t.exe
215+
PythonExePattern: ${{ iif(eq(parameters.Post315OutputDir, 'true'), 'python.exe', 'python3*t.exe') }}
216216
ExtraOptions: ${{ parameters.ExtraOptionsFreethreaded }} ${{ parameters.TailCallingOption }}
217217
${{ if eq(parameters.ToBeSigned, 'true') }}:
218218
Artifact: unsigned_amd64_t
@@ -254,8 +254,8 @@ jobs:
254254
arm64_t:
255255
Name: arm64_t
256256
Arch: arm64
257-
ArchDir: arm64${{ parameters.ArchSuffix }}
258-
PythonExePattern314: python3*t.exe
257+
ArchDir: ${{ iif(eq(parameters.Post315OutputDir, 'true'), 'arm64t', 'arm64') }}
258+
PythonExePattern: ${{ iif(eq(parameters.Post315OutputDir, 'true'), 'python.exe', 'python3*t.exe') }}
259259
ExtraOptions: ${{ parameters.ExtraOptionsFreethreaded }}
260260
${{ if eq(parameters.ToBeSigned, 'true') }}:
261261
Artifact: unsigned_arm64_t
@@ -298,8 +298,8 @@ jobs:
298298
arm64_t:
299299
Name: arm64_t
300300
Arch: arm64
301-
ArchDir: arm64${{ parameters.ArchSuffix }}
302-
PythonExePattern: python3*t.exe
301+
ArchDir: ${{ iif(eq(parameters.Post315OutputDir, 'true'), 'arm64t', 'arm64') }}
302+
PythonExePattern: ${{ iif(eq(parameters.Post315OutputDir, 'true'), 'python.exe', 'python3*t.exe') }}
303303
${{ if eq(parameters.ToBeSigned, 'true') }}:
304304
Artifact: unsigned_arm64_t
305305
${{ else }}:
@@ -337,8 +337,8 @@ jobs:
337337
arm64_t:
338338
Name: arm64_t
339339
Arch: arm64
340-
ArchDir: arm64${{ parameters.ArchSuffix }}
341-
PythonExePattern: python3*t.exe
340+
ArchDir: ${{ iif(eq(parameters.Post315OutputDir, 'true'), 'arm64t', 'arm64') }}
341+
PythonExePattern: ${{ iif(eq(parameters.Post315OutputDir, 'true'), 'python.exe', 'python3*t.exe') }}
342342
ExtraOptions: ${{ parameters.ExtraOptionsFreethreaded }}
343343
${{ if eq(parameters.ToBeSigned, 'true') }}:
344344
Artifact: unsigned_arm64_t

‎windows-release/stage-msi.yml‎

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ parameters:
33
DoARM64: true
44
DoFreethreaded: false
55
SigningCertificate: ''
6-
ArchSuffix: ''
6+
Post315OutputDir: false
77

88
jobs:
99
- job: Make_MSI
@@ -52,19 +52,34 @@ jobs:
5252
# Freethreaded binaries copy into the same target directory, but files
5353
# are not overwritten.
5454
- ${{ if eq(parameters.DoFreethreaded, 'true') }}:
55-
- artifact: bin_win32_t
56-
target: $(Build.BinariesDirectory)\win32${{parameters.ArchSuffix}}
57-
- artifact: bin_win32_td
58-
target: $(Build.BinariesDirectory)\win32${{parameters.ArchSuffix}}
59-
- artifact: bin_amd64_t
60-
target: $(Build.BinariesDirectory)\amd64${{parameters.ArchSuffix}}
61-
- artifact: bin_amd64_td
62-
target: $(Build.BinariesDirectory)\amd64${{parameters.ArchSuffix}}
63-
- ${{ if eq(parameters.DoARM64, 'true') }}:
64-
- artifact: bin_arm64_t
65-
target: $(Build.BinariesDirectory)\arm64${{parameters.ArchSuffix}}
66-
- artifact: bin_arm64_td
67-
target: $(Build.BinariesDirectory)\arm64${{parameters.ArchSuffix}}
55+
- ${{ if eq(parameters.Post315OutputDir, 'true') }}:
56+
- artifact: bin_win32_t
57+
target: $(Build.BinariesDirectory)\win32t
58+
- artifact: bin_win32_td
59+
target: $(Build.BinariesDirectory)\win32t
60+
- artifact: bin_amd64_t
61+
target: $(Build.BinariesDirectory)\amd64t
62+
- artifact: bin_amd64_td
63+
target: $(Build.BinariesDirectory)\amd64t
64+
- ${{ if eq(parameters.DoARM64, 'true') }}:
65+
- artifact: bin_arm64_t
66+
target: $(Build.BinariesDirectory)\arm64t
67+
- artifact: bin_arm64_td
68+
target: $(Build.BinariesDirectory)\arm64t
69+
- ${{ else }}:
70+
- artifact: bin_win32_t
71+
target: $(Build.BinariesDirectory)\win32
72+
- artifact: bin_win32_td
73+
target: $(Build.BinariesDirectory)\win32
74+
- artifact: bin_amd64_t
75+
target: $(Build.BinariesDirectory)\amd64
76+
- artifact: bin_amd64_td
77+
target: $(Build.BinariesDirectory)\amd64
78+
- ${{ if eq(parameters.DoARM64, 'true') }}:
79+
- artifact: bin_arm64_t
80+
target: $(Build.BinariesDirectory)\arm64
81+
- artifact: bin_arm64_td
82+
target: $(Build.BinariesDirectory)\arm64
6883
Bundles:
6984
- bundle: win32
7085
Platform: x86

0 commit comments

Comments
 (0)