Skip to content

Commit 6db61cb

Browse files
committed
$(TailcallingOption) not needed anymore
add missing ${{ parameters.TailcallingOption }} remove unneeded TailcallingOption: ''
1 parent 33a030b commit 6db61cb

3 files changed

Lines changed: 7 additions & 20 deletions

File tree

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) $(TailcallingOption)
25+
.\PCbuild\build.bat -v -p $(Platform) -c PGInstrument $(ExtraOptions)
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) $(TailcallingOption)
103+
.\PCbuild\build.bat -v -p $(Platform) -c PGUpdate $(ExtraOptions)
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) $(TailcallingOption)
21+
.\PCbuild\build.bat -v -p $(Platform) -c $(Configuration) $(ExtraOptions)
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) $(TailcallingOption)
30+
.\PCbuild\build.bat -v -p $(Platform) --pgo $(ExtraOptions)
3131
displayName: 'Run build with PGO'
3232
env:
3333
IncludeUwp: true

windows-release/stage-build.yml

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ jobs:
5353
Configuration: Release
5454
_HostPython: .\python
5555
ExtraOptions: ${{ parameters.ExtraOptions }}
56-
TailcallingOption: ''
5756
${{ if eq(parameters.ToBeSigned, 'true') }}:
5857
Artifact: unsigned_win32
5958
${{ else }}:
@@ -65,7 +64,6 @@ jobs:
6564
Configuration: Debug
6665
_HostPython: .\python
6766
ExtraOptions: ${{ parameters.ExtraOptions }}
68-
TailcallingOption: ''
6967
Artifact: bin_win32_d
7068
${{ if ne(parameters.DoPGO, 'true') }}:
7169
amd64:
@@ -86,7 +84,6 @@ jobs:
8684
Configuration: Debug
8785
_HostPython: .\python
8886
ExtraOptions: ${{ parameters.ExtraOptions }}
89-
TailcallingOption: ''
9087
Artifact: bin_amd64_d
9188
${{ if or(ne(parameters.DoPGO, 'true'), ne(parameters.DoPGOARM64, 'true')) }}:
9289
arm64:
@@ -96,7 +93,6 @@ jobs:
9693
Configuration: Release
9794
_HostPython: python
9895
ExtraOptions: ${{ parameters.ExtraOptions }}
99-
TailcallingOption: ''
10096
${{ if eq(parameters.ToBeSigned, 'true') }}:
10197
Artifact: unsigned_arm64
10298
${{ else }}:
@@ -108,7 +104,6 @@ jobs:
108104
Configuration: Debug
109105
_HostPython: python
110106
ExtraOptions: ${{ parameters.ExtraOptions }}
111-
TailcallingOption: ''
112107
Artifact: bin_arm64_d
113108
${{ if eq(parameters.DoFreethreaded, 'true') }}:
114109
win32_t:
@@ -118,7 +113,6 @@ jobs:
118113
Configuration: Release
119114
_HostPython: .\python
120115
ExtraOptions: ${{ parameters.ExtraOptionsFreethreaded }}
121-
TailcallingOption: ''
122116
${{ if eq(parameters.ToBeSigned, 'true') }}:
123117
Artifact: unsigned_win32_t
124118
${{ else }}:
@@ -130,7 +124,6 @@ jobs:
130124
Configuration: Debug
131125
_HostPython: .\python
132126
ExtraOptions: ${{ parameters.ExtraOptionsFreethreaded }}
133-
TailcallingOption: ''
134127
Artifact: bin_win32_td
135128
${{ if ne(parameters.DoPGO, 'true') }}:
136129
amd64_t:
@@ -139,8 +132,7 @@ jobs:
139132
Platform: x64
140133
Configuration: Release
141134
_HostPython: .\python
142-
ExtraOptions: ${{ parameters.ExtraOptionsFreethreaded }}
143-
TailcallingOption: ${{ parameters.TailcallingOption }}
135+
ExtraOptions: ${{ parameters.ExtraOptionsFreethreaded }} ${{ parameters.TailcallingOption }}
144136
${{ if eq(parameters.ToBeSigned, 'true') }}:
145137
Artifact: unsigned_amd64_t
146138
${{ else }}:
@@ -152,7 +144,6 @@ jobs:
152144
Configuration: Debug
153145
_HostPython: .\python
154146
ExtraOptions: ${{ parameters.ExtraOptionsFreethreaded }}
155-
TailcallingOption: ''
156147
Artifact: bin_amd64_td
157148
${{ if or(ne(parameters.DoPGO, 'true'), ne(parameters.DoPGOARM64, 'true')) }}:
158149
arm64_t:
@@ -162,7 +153,6 @@ jobs:
162153
Configuration: Release
163154
_HostPython: python
164155
ExtraOptions: ${{ parameters.ExtraOptionsFreethreaded }}
165-
TailcallingOption: ''
166156
${{ if eq(parameters.ToBeSigned, 'true') }}:
167157
Artifact: unsigned_arm64_t
168158
${{ else }}:
@@ -174,7 +164,6 @@ jobs:
174164
Configuration: Debug
175165
_HostPython: python
176166
ExtraOptions: ${{ parameters.ExtraOptionsFreethreaded }}
177-
TailcallingOption: ''
178167
Artifact: bin_arm64_td
179168

180169
steps:
@@ -197,8 +186,7 @@ jobs:
197186
Platform: x64
198187
_HostPython: .\python
199188
PythonExePattern: python.exe
200-
ExtraOptions: ${{ parameters.ExtraOptions }}
201-
TailcallingOption: ${{ parameters.TailcallingOption }}
189+
ExtraOptions: ${{ parameters.ExtraOptions }} ${{ parameters.TailcallingOption }}
202190
${{ if eq(parameters.ToBeSigned, 'true') }}:
203191
Artifact: unsigned_amd64
204192
${{ else }}:
@@ -210,8 +198,7 @@ jobs:
210198
Platform: x64
211199
_HostPython: .\python
212200
PythonExePattern: python3*t.exe
213-
ExtraOptions: ${{ parameters.ExtraOptionsFreethreaded }}
214-
TailcallingOption: ${{ parameters.TailcallingOption }}
201+
ExtraOptions: ${{ parameters.ExtraOptionsFreethreaded }} ${{ parameters.TailcallingOption }}
215202
${{ if eq(parameters.ToBeSigned, 'true') }}:
216203
Artifact: unsigned_amd64_t
217204
${{ else }}:

0 commit comments

Comments
 (0)