Skip to content

Commit faeb85f

Browse files
committed
Run MSRV check on Windows CI
1 parent 0b8387e commit faeb85f

File tree

2 files changed

+43
-1
lines changed

2 files changed

+43
-1
lines changed

.github/workflows/bors.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,30 @@ jobs:
226226
- name: Execute build.sh
227227
run: LIBC_CI=1 TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
228228

229+
build_channels_windows:
230+
name: Build Channels Windows
231+
runs-on: windows-2019
232+
env:
233+
OS: windows
234+
strategy:
235+
fail-fast: true
236+
matrix:
237+
toolchain: [
238+
1.19.0,
239+
1.24.0,
240+
1.25.0,
241+
1.30.0,
242+
stable,
243+
]
244+
steps:
245+
- uses: actions/checkout@v2
246+
- name: Self-update rustup
247+
run: rustup self update
248+
shell: bash
249+
- name: Execute build.sh
250+
run: LIBC_CI=1 TOOLCHAIN=${{ matrix.toolchain }} WIN_TARGET=${{ matrix.target }} sh ./ci/build.sh
251+
shell: bash
252+
229253
semver_linux:
230254
name: Semver Linux
231255
runs-on: ubuntu-20.04
@@ -283,6 +307,7 @@ jobs:
283307
docker_switch,
284308
build_channels_linux,
285309
build_channels_macos,
310+
build_channels_windows,
286311
docs,
287312
]
288313

@@ -303,6 +328,7 @@ jobs:
303328
docker_switch,
304329
build_channels_linux,
305330
build_channels_macos,
331+
build_channels_windows,
306332
docs,
307333
]
308334

ci/build.sh

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,13 @@ RUST_NIGHTLY_APPLE_TARGETS="\
161161
aarch64-apple-darwin \
162162
"
163163

164+
# Must start with `x86_64-pc-windows-msvc` first.
165+
RUST_NIGHTLY_WINDOWS_TARGETS="\
166+
x86_64-pc-windows-msvc \
167+
x86_64-pc-windows-gnu \
168+
i686-pc-windows-msvc \
169+
"
170+
164171
# The targets are listed here alphabetically
165172
TARGETS=""
166173
case "${OS}" in
@@ -189,14 +196,23 @@ case "${OS}" in
189196
TARGETS="${TARGETS} ${RUST_NIGHTLY_APPLE_TARGETS}"
190197
fi
191198

199+
;;
200+
windows*)
201+
TARGETS=${RUST_NIGHTLY_WINDOWS_TARGETS}
202+
192203
;;
193204
*)
194205
;;
195206
esac
196207

197208
for TARGET in $TARGETS; do
198209
if echo "$TARGET"|grep -q "$FILTER"; then
199-
test_target build "$TARGET"
210+
if [ "${OS}" = "windows" ]; then
211+
TARGET="$TARGET" sh ./ci/install-rust.sh
212+
test_target build "$TARGET"
213+
else
214+
test_target build "$TARGET"
215+
fi
200216
fi
201217
done
202218

0 commit comments

Comments
 (0)