Skip to content

Commit 7abd79b

Browse files
chris-eiblchris-eibl
committed
Different approach. Does this work out?
1 parent c49abd8 commit 7abd79b

File tree

4 files changed

+27
-10
lines changed

4 files changed

+27
-10
lines changed

‎windows-release/azure-pipelines.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,10 @@ stages:
190190
ExtraOptionsFreethreaded: '--disable-gil --experimental-jit-off'
191191
${{ else }}:
192192
ExtraOptionsFreethreaded: '--disable-gil --experimental-jit'
193-
193+
${{ if ne(parameters.DoTailcalling, 'true') }}:
194+
TailcallingOption: ''
195+
${{ else }}:
196+
TailcallingOption: '--tail-call-interp'
194197
- stage: Sign
195198
displayName: Sign binaries
196199
dependsOn: Build

‎windows-release/build-steps-pgo.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ steps:
2222
- ${{ if eq(parameters.PGInstrument, 'true') }}:
2323
- powershell: |
2424
$env:SigningCertificate = $null
25-
.\PCbuild\build.bat -v -p $(Platform) -c PGInstrument $(ExtraOptions)
25+
.\PCbuild\build.bat -v -p $(Platform) -c PGInstrument $(ExtraOptions) $(TailcallingOption)
2626
displayName: 'Run build'
2727
env:
2828
IncludeUwp: true
@@ -100,7 +100,7 @@ steps:
100100
101101
- powershell: |
102102
$env:SigningCertificate = $null
103-
.\PCbuild\build.bat -v -p $(Platform) -c PGUpdate $(ExtraOptions)
103+
.\PCbuild\build.bat -v -p $(Platform) -c PGUpdate $(ExtraOptions) $(TailcallingOption)
104104
displayName: 'Run build with PGO'
105105
env:
106106
IncludeUwp: true

‎windows-release/build-steps.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ steps:
1818
- ${{ if eq(parameters.ShouldPGO, 'false') }}:
1919
- powershell: |
2020
$env:SigningCertificate = $null
21-
.\PCbuild\build.bat -v -p $(Platform) -c $(Configuration) $(ExtraOptions)
21+
.\PCbuild\build.bat -v -p $(Platform) -c $(Configuration) $(ExtraOptions) $(TailcallingOption)
2222
displayName: 'Run build'
2323
env:
2424
IncludeUwp: true
@@ -27,7 +27,7 @@ steps:
2727
- ${{ else }}:
2828
- powershell: |
2929
$env:SigningCertificate = $null
30-
.\PCbuild\build.bat -v -p $(Platform) --pgo $(ExtraOptions)
30+
.\PCbuild\build.bat -v -p $(Platform) --pgo $(ExtraOptions) $(TailcallingOption)
3131
displayName: 'Run build with PGO'
3232
env:
3333
IncludeUwp: true

‎windows-release/stage-build.yml‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ parameters:
44
DoPGOARM64: true
55
DoFreethreaded: false
66
ToBeSigned: false
7-
DoTailcalling: false
87
ExtraOptions: ''
98
ExtraOptionsFreethreaded: '--disable-gil'
9+
TailcallingOption: ''
1010

1111
jobs:
1212
- job: Build_Docs
@@ -53,6 +53,7 @@ jobs:
5353
Configuration: Release
5454
_HostPython: .\python
5555
ExtraOptions: ${{ parameters.ExtraOptions }}
56+
TailcallingOption: ''
5657
${{ if eq(parameters.ToBeSigned, 'true') }}:
5758
Artifact: unsigned_win32
5859
${{ else }}:
@@ -64,6 +65,7 @@ jobs:
6465
Configuration: Debug
6566
_HostPython: .\python
6667
ExtraOptions: ${{ parameters.ExtraOptions }}
68+
TailcallingOption: ''
6769
Artifact: bin_win32_d
6870
${{ if ne(parameters.DoPGO, 'true') }}:
6971
amd64:
@@ -72,7 +74,8 @@ jobs:
7274
Platform: x64
7375
Configuration: Release
7476
_HostPython: .\python
75-
ExtraOptions: ${{ parameters.ExtraOptions }}${{ if eq(parameters.DoTailcalling, 'true') }} ' --tail-call-interp'
77+
ExtraOptions: ${{ parameters.ExtraOptions }}
78+
TailcallingOption: ${{ parameters.TailcallingOption }}
7679
${{ if eq(parameters.ToBeSigned, 'true') }}:
7780
Artifact: unsigned_amd64
7881
${{ else }}:
@@ -84,6 +87,7 @@ jobs:
8487
Configuration: Debug
8588
_HostPython: .\python
8689
ExtraOptions: ${{ parameters.ExtraOptions }}
90+
TailcallingOption: ''
8791
Artifact: bin_amd64_d
8892
${{ if or(ne(parameters.DoPGO, 'true'), ne(parameters.DoPGOARM64, 'true')) }}:
8993
arm64:
@@ -93,6 +97,7 @@ jobs:
9397
Configuration: Release
9498
_HostPython: python
9599
ExtraOptions: ${{ parameters.ExtraOptions }}
100+
TailcallingOption: ''
96101
${{ if eq(parameters.ToBeSigned, 'true') }}:
97102
Artifact: unsigned_arm64
98103
${{ else }}:
@@ -104,6 +109,7 @@ jobs:
104109
Configuration: Debug
105110
_HostPython: python
106111
ExtraOptions: ${{ parameters.ExtraOptions }}
112+
TailcallingOption: ''
107113
Artifact: bin_arm64_d
108114
${{ if eq(parameters.DoFreethreaded, 'true') }}:
109115
win32_t:
@@ -113,6 +119,7 @@ jobs:
113119
Configuration: Release
114120
_HostPython: .\python
115121
ExtraOptions: ${{ parameters.ExtraOptionsFreethreaded }}
122+
TailcallingOption: ''
116123
${{ if eq(parameters.ToBeSigned, 'true') }}:
117124
Artifact: unsigned_win32_t
118125
${{ else }}:
@@ -124,6 +131,7 @@ jobs:
124131
Configuration: Debug
125132
_HostPython: .\python
126133
ExtraOptions: ${{ parameters.ExtraOptionsFreethreaded }}
134+
TailcallingOption: ''
127135
Artifact: bin_win32_td
128136
${{ if ne(parameters.DoPGO, 'true') }}:
129137
amd64_t:
@@ -132,7 +140,8 @@ jobs:
132140
Platform: x64
133141
Configuration: Release
134142
_HostPython: .\python
135-
ExtraOptions: ${{ parameters.ExtraOptionsFreethreaded }}${{ if eq(parameters.DoTailcalling, 'true') }} ' --tail-call-interp'
143+
ExtraOptions: ${{ parameters.ExtraOptionsFreethreaded }}
144+
TailcallingOption: ${{ parameters.TailcallingOption }}
136145
${{ if eq(parameters.ToBeSigned, 'true') }}:
137146
Artifact: unsigned_amd64_t
138147
${{ else }}:
@@ -144,6 +153,7 @@ jobs:
144153
Configuration: Debug
145154
_HostPython: .\python
146155
ExtraOptions: ${{ parameters.ExtraOptionsFreethreaded }}
156+
TailcallingOption: ''
147157
Artifact: bin_amd64_td
148158
${{ if or(ne(parameters.DoPGO, 'true'), ne(parameters.DoPGOARM64, 'true')) }}:
149159
arm64_t:
@@ -153,6 +163,7 @@ jobs:
153163
Configuration: Release
154164
_HostPython: python
155165
ExtraOptions: ${{ parameters.ExtraOptionsFreethreaded }}
166+
TailcallingOption: ''
156167
${{ if eq(parameters.ToBeSigned, 'true') }}:
157168
Artifact: unsigned_arm64_t
158169
${{ else }}:
@@ -164,6 +175,7 @@ jobs:
164175
Configuration: Debug
165176
_HostPython: python
166177
ExtraOptions: ${{ parameters.ExtraOptionsFreethreaded }}
178+
TailcallingOption: ''
167179
Artifact: bin_arm64_td
168180

169181
steps:
@@ -186,7 +198,8 @@ jobs:
186198
Platform: x64
187199
_HostPython: .\python
188200
PythonExePattern: python.exe
189-
ExtraOptions: ${{ parameters.ExtraOptions }}${{ if eq(parameters.DoTailcalling, 'true') }} ' --tail-call-interp'
201+
ExtraOptions: ${{ parameters.ExtraOptions }}
202+
TailcallingOption: ${{ parameters.TailcallingOption }}
190203
${{ if eq(parameters.ToBeSigned, 'true') }}:
191204
Artifact: unsigned_amd64
192205
${{ else }}:
@@ -198,7 +211,8 @@ jobs:
198211
Platform: x64
199212
_HostPython: .\python
200213
PythonExePattern: python3*t.exe
201-
ExtraOptions: ${{ parameters.ExtraOptionsFreethreaded }}${{ if eq(parameters.DoTailcalling, 'true') }} ' --tail-call-interp'
214+
ExtraOptions: ${{ parameters.ExtraOptionsFreethreaded }}
215+
TailcallingOption: ${{ parameters.TailcallingOption }}
202216
${{ if eq(parameters.ToBeSigned, 'true') }}:
203217
Artifact: unsigned_amd64_t
204218
${{ else }}:

0 commit comments

Comments
 (0)