Skip to content

Commit ecbb5ea

Browse files
authored
[CI] Small adjustments to the Windows actions (#2939)
# Motivation There were two small problems: 1. The CI for the nightlies wasn't properly skipped 2. The name for the matrix wasn't applied in the case where it was skipped # Modification This PR hopefully fixes both issues.
1 parent ff6dea9 commit ecbb5ea

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.github/workflows/swift_matrix.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ jobs:
151151
windows:
152152
name: Windows (${{ matrix.swift.swift_version }})
153153
runs-on: windows-2022
154-
if: ${{ inputs.matrix_windows_6_0_enabled }}
155154
strategy:
156155
fail-fast: false
157156
matrix:
@@ -160,6 +159,7 @@ jobs:
160159
- image: swift:6.0-windowsservercore-ltsc2022
161160
swift_version: "6.0"
162161
enabled: ${{ inputs.matrix_windows_6_0_enabled }}
162+
if: ${{ inputs.matrix_windows_6_0_enabled }}
163163
steps:
164164
- name: Pull Docker image
165165
if: ${{ matrix.swift.enabled }}
@@ -180,7 +180,6 @@ jobs:
180180
windows-nightly:
181181
name: Windows (${{ matrix.swift.swift_version }})
182182
runs-on: windows-2019
183-
if: ${{ inputs.matrix_windows_nightly_6_0_enabled }} && ${{ inputs.matrix_windows_nightly_main_enabled }}
184183
strategy:
185184
fail-fast: false
186185
matrix:
@@ -192,6 +191,7 @@ jobs:
192191
- image: swiftlang/swift:nightly-main-windowsservercore-1809
193192
swift_version: "nightly-main"
194193
enabled: ${{ inputs.matrix_windows_nightly_main_enabled }}
194+
if: ${{ inputs.matrix_windows_nightly_6_0_enabled }} || ${{ inputs.matrix_windows_nightly_main_enabled }}
195195
steps:
196196
- name: Pull Docker image
197197
if: ${{ matrix.swift.enabled }}

.github/workflows/unit_tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ jobs:
8787
matrix_linux_nightly_6_0_command_override: "swift test ${{ inputs.linux_nightly_6_0_arguments_override }}"
8888
matrix_linux_nightly_main_enabled: ${{ inputs.linux_nightly_main_enabled }}
8989
matrix_linux_nightly_main_command_override: "swift test ${{ inputs.linux_nightly_main_arguments_override }}"
90+
matrix_windows_command: "swift test"
9091
matrix_windows_6_0_enabled: ${{ inputs.windows_6_0_enabled }}
9192
matrix_windows_6_0_command_override: "swift test ${{ inputs.windows_6_0_arguments_override }}"
9293
matrix_windows_nightly_6_0_enabled: ${{ inputs.windows_nightly_6_0_enabled }}

0 commit comments

Comments
 (0)