File tree Expand file tree Collapse file tree 2 files changed +3
-2
lines changed Expand file tree Collapse file tree 2 files changed +3
-2
lines changed Original file line number Diff line number Diff line change @@ -151,7 +151,6 @@ jobs:
151
151
windows :
152
152
name : Windows (${{ matrix.swift.swift_version }})
153
153
runs-on : windows-2022
154
- if : ${{ inputs.matrix_windows_6_0_enabled }}
155
154
strategy :
156
155
fail-fast : false
157
156
matrix :
@@ -160,6 +159,7 @@ jobs:
160
159
- image : swift:6.0-windowsservercore-ltsc2022
161
160
swift_version : " 6.0"
162
161
enabled : ${{ inputs.matrix_windows_6_0_enabled }}
162
+ if : ${{ inputs.matrix_windows_6_0_enabled }}
163
163
steps :
164
164
- name : Pull Docker image
165
165
if : ${{ matrix.swift.enabled }}
@@ -180,7 +180,6 @@ jobs:
180
180
windows-nightly :
181
181
name : Windows (${{ matrix.swift.swift_version }})
182
182
runs-on : windows-2019
183
- if : ${{ inputs.matrix_windows_nightly_6_0_enabled }} && ${{ inputs.matrix_windows_nightly_main_enabled }}
184
183
strategy :
185
184
fail-fast : false
186
185
matrix :
@@ -192,6 +191,7 @@ jobs:
192
191
- image : swiftlang/swift:nightly-main-windowsservercore-1809
193
192
swift_version : " nightly-main"
194
193
enabled : ${{ inputs.matrix_windows_nightly_main_enabled }}
194
+ if : ${{ inputs.matrix_windows_nightly_6_0_enabled }} || ${{ inputs.matrix_windows_nightly_main_enabled }}
195
195
steps :
196
196
- name : Pull Docker image
197
197
if : ${{ matrix.swift.enabled }}
Original file line number Diff line number Diff line change 87
87
matrix_linux_nightly_6_0_command_override : " swift test ${{ inputs.linux_nightly_6_0_arguments_override }}"
88
88
matrix_linux_nightly_main_enabled : ${{ inputs.linux_nightly_main_enabled }}
89
89
matrix_linux_nightly_main_command_override : " swift test ${{ inputs.linux_nightly_main_arguments_override }}"
90
+ matrix_windows_command : " swift test"
90
91
matrix_windows_6_0_enabled : ${{ inputs.windows_6_0_enabled }}
91
92
matrix_windows_6_0_command_override : " swift test ${{ inputs.windows_6_0_arguments_override }}"
92
93
matrix_windows_nightly_6_0_enabled : ${{ inputs.windows_nightly_6_0_enabled }}
You can’t perform that action at this time.
0 commit comments