Skip to content

Commit 7a50eb6

Browse files
brandtbucherbrandtbucher
committed
Combine ExtraOptionsFreethreaded
1 parent e3c5856 commit 7a50eb6

File tree

2 files changed

+26
-26
lines changed

2 files changed

+26
-26
lines changed

‎windows-release/azure-pipelines.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,17 +154,17 @@ stages:
154154
${{ if and(parameters.SigningCertificate, ne(parameters.SigningCertificate, 'Unsigned')) }}:
155155
ToBeSigned: true
156156
${{ if ne(parameters.DoJIT, 'true') }}:
157-
JITOption: ''
157+
ExtraOptions: ''
158158
${{ elseif ne(parameters.DoJITEnabled, 'true') }}:
159-
JITOption: '--experimental-jit-off'
159+
ExtraOptions: '--experimental-jit-off'
160160
${{ else }}:
161-
JITOption: '--experimental-jit'
161+
ExtraOptions: '--experimental-jit'
162162
${{ if or(ne(parameters.DoJIT, 'true'), ne(parameters.DoJITFreethreaded, 'true')) }}:
163-
JITOptionFreethreaded: ''
163+
ExtraOptionsFreethreaded: '--disable-gil'
164164
${{ elseif ne(parameters.DoJITEnabled, 'true') }}:
165-
JITOptionFreethreaded: '--experimental-jit-off'
165+
ExtraOptionsFreethreaded: '--disable-gil --experimental-jit-off'
166166
${{ else }}:
167-
JITOptionFreethreaded: '--experimental-jit'
167+
ExtraOptionsFreethreaded: '--disable-gil --experimental-jit'
168168

169169
- stage: Sign
170170
displayName: Sign binaries

‎windows-release/stage-build.yml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ parameters:
44
DoPGOARM64: true
55
DoFreethreaded: false
66
ToBeSigned: false
7-
JITOption: ''
8-
JITOptionFreethreaded: ''
7+
ExtraOptions: ''
8+
ExtraOptionsFreethreaded: ''
99

1010
jobs:
1111
- job: Build_Docs
@@ -54,7 +54,7 @@ jobs:
5454
Platform: x86
5555
Configuration: Release
5656
_HostPython: .\python
57-
ExtraOptions: ${{ parameters.JITOption }}
57+
ExtraOptions: ${{ parameters.ExtraOptions }}
5858
${{ if eq(parameters.ToBeSigned, 'true') }}:
5959
Artifact: unsigned_win32
6060
${{ else }}:
@@ -65,7 +65,7 @@ jobs:
6565
Platform: x86
6666
Configuration: Debug
6767
_HostPython: .\python
68-
ExtraOptions: ${{ parameters.JITOption }}
68+
ExtraOptions: ${{ parameters.ExtraOptions }}
6969
Artifact: bin_win32_d
7070
${{ if ne(parameters.DoPGO, 'true') }}:
7171
amd64:
@@ -74,7 +74,7 @@ jobs:
7474
Platform: x64
7575
Configuration: Release
7676
_HostPython: .\python
77-
ExtraOptions: ${{ parameters.JITOption }}
77+
ExtraOptions: ${{ parameters.ExtraOptions }}
7878
${{ if eq(parameters.ToBeSigned, 'true') }}:
7979
Artifact: unsigned_amd64
8080
${{ else }}:
@@ -85,7 +85,7 @@ jobs:
8585
Platform: x64
8686
Configuration: Debug
8787
_HostPython: .\python
88-
ExtraOptions: ${{ parameters.JITOption }}
88+
ExtraOptions: ${{ parameters.ExtraOptions }}
8989
Artifact: bin_amd64_d
9090
${{ if or(ne(parameters.DoPGO, 'true'), ne(parameters.DoPGOARM64, 'true')) }}:
9191
arm64:
@@ -94,7 +94,7 @@ jobs:
9494
Platform: ARM64
9595
Configuration: Release
9696
_HostPython: python
97-
ExtraOptions: ${{ parameters.JITOption }}
97+
ExtraOptions: ${{ parameters.ExtraOptions }}
9898
${{ if eq(parameters.ToBeSigned, 'true') }}:
9999
Artifact: unsigned_arm64
100100
${{ else }}:
@@ -105,7 +105,7 @@ jobs:
105105
Platform: ARM64
106106
Configuration: Debug
107107
_HostPython: python
108-
ExtraOptions: ${{ parameters.JITOption }}
108+
ExtraOptions: ${{ parameters.ExtraOptions }}
109109
Artifact: bin_arm64_d
110110
${{ if eq(parameters.DoFreethreaded, 'true') }}:
111111
win32_t:
@@ -114,7 +114,7 @@ jobs:
114114
Platform: x86
115115
Configuration: Release
116116
_HostPython: .\python
117-
ExtraOptions: '--disable-gil ${{ parameters.JITOptionFreethreaded }}'
117+
ExtraOptions: ${{ parameters.ExtraOptionsFreethreaded }}
118118
${{ if eq(parameters.ToBeSigned, 'true') }}:
119119
Artifact: unsigned_win32_t
120120
${{ else }}:
@@ -125,7 +125,7 @@ jobs:
125125
Platform: x86
126126
Configuration: Debug
127127
_HostPython: .\python
128-
ExtraOptions: '--disable-gil ${{ parameters.JITOptionFreethreaded }}'
128+
ExtraOptions: ${{ parameters.ExtraOptionsFreethreaded }}
129129
Artifact: bin_win32_td
130130
${{ if ne(parameters.DoPGO, 'true') }}:
131131
amd64_t:
@@ -134,7 +134,7 @@ jobs:
134134
Platform: x64
135135
Configuration: Release
136136
_HostPython: .\python
137-
ExtraOptions: '--disable-gil ${{ parameters.JITOptionFreethreaded }}'
137+
ExtraOptions: ${{ parameters.ExtraOptionsFreethreaded }}
138138
${{ if eq(parameters.ToBeSigned, 'true') }}:
139139
Artifact: unsigned_amd64_t
140140
${{ else }}:
@@ -145,7 +145,7 @@ jobs:
145145
Platform: x64
146146
Configuration: Debug
147147
_HostPython: .\python
148-
ExtraOptions: '--disable-gil ${{ parameters.JITOptionFreethreaded }}'
148+
ExtraOptions: ${{ parameters.ExtraOptionsFreethreaded }}
149149
Artifact: bin_amd64_td
150150
${{ if or(ne(parameters.DoPGO, 'true'), ne(parameters.DoPGOARM64, 'true')) }}:
151151
arm64_t:
@@ -154,7 +154,7 @@ jobs:
154154
Platform: ARM64
155155
Configuration: Release
156156
_HostPython: python
157-
ExtraOptions: '--disable-gil ${{ parameters.JITOptionFreethreaded }}'
157+
ExtraOptions: ${{ parameters.ExtraOptionsFreethreaded }}
158158
${{ if eq(parameters.ToBeSigned, 'true') }}:
159159
Artifact: unsigned_arm64_t
160160
${{ else }}:
@@ -165,7 +165,7 @@ jobs:
165165
Platform: ARM64
166166
Configuration: Debug
167167
_HostPython: python
168-
ExtraOptions: '--disable-gil ${{ parameters.JITOptionFreethreaded }}'
168+
ExtraOptions: ${{ parameters.ExtraOptionsFreethreaded }}
169169
Artifact: bin_arm64_td
170170

171171
steps:
@@ -190,7 +190,7 @@ jobs:
190190
Platform: x64
191191
_HostPython: .\python
192192
PythonExePattern: python.exe
193-
ExtraOptions: ${{ parameters.JITOption }}
193+
ExtraOptions: ${{ parameters.ExtraOptions }}
194194
${{ if eq(parameters.ToBeSigned, 'true') }}:
195195
Artifact: unsigned_amd64
196196
${{ else }}:
@@ -202,7 +202,7 @@ jobs:
202202
Platform: x64
203203
_HostPython: .\python
204204
PythonExePattern: python3*t.exe
205-
ExtraOptions: '--disable-gil ${{ parameters.JITOptionFreethreaded }}'
205+
ExtraOptions: ${{ parameters.ExtraOptionsFreethreaded }}
206206
${{ if eq(parameters.ToBeSigned, 'true') }}:
207207
Artifact: unsigned_amd64_t
208208
${{ else }}:
@@ -235,7 +235,7 @@ jobs:
235235
arm64:
236236
Name: arm64
237237
PythonExePattern: python.exe
238-
ExtraOptions: ${{ parameters.JITOption }}
238+
ExtraOptions: ${{ parameters.ExtraOptions }}
239239
${{ if eq(parameters.ToBeSigned, 'true') }}:
240240
Artifact: unsigned_arm64
241241
${{ else }}:
@@ -244,7 +244,7 @@ jobs:
244244
arm64_t:
245245
Name: arm64_t
246246
PythonExePattern: python3*t.exe
247-
ExtraOptions: '--disable-gil ${{ parameters.JITOptionFreethreaded }}'
247+
ExtraOptions: ${{ parameters.ExtraOptionsFreethreaded }}
248248
${{ if eq(parameters.ToBeSigned, 'true') }}:
249249
Artifact: unsigned_arm64_t
250250
${{ else }}:
@@ -315,7 +315,7 @@ jobs:
315315
arm64:
316316
Name: arm64
317317
PythonExePattern: python.exe
318-
ExtraOptions: ${{ parameters.JITOption }}
318+
ExtraOptions: ${{ parameters.ExtraOptions }}
319319
${{ if eq(parameters.ToBeSigned, 'true') }}:
320320
Artifact: unsigned_arm64
321321
${{ else }}:
@@ -324,7 +324,7 @@ jobs:
324324
arm64_t:
325325
Name: arm64_t
326326
PythonExePattern: python3*t.exe
327-
ExtraOptions: '--disable-gil ${{ parameters.JITOptionFreethreaded }}'
327+
ExtraOptions: ${{ parameters.ExtraOptionsFreethreaded }}
328328
${{ if eq(parameters.ToBeSigned, 'true') }}:
329329
Artifact: unsigned_arm64_t
330330
${{ else }}:

0 commit comments

Comments
 (0)