Skip to content

Commit cf89907

Browse files
committed
Auto merge of #1932 - JohnTitor:harden-builds, r=JohnTitor
Add some more targets for build testing - `x86_64-unknown-illumos`: We now have the illumos module and it'd be great if we could test it actually. - `aarch64-apple-darwin`: This target will be used more widely in the future and it should make sense to run CI for it as well.
2 parents 35ee6ed + 5583b5b commit cf89907

File tree

1 file changed

+19
-9
lines changed

1 file changed

+19
-9
lines changed

ci/build.sh

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -147,16 +147,21 @@ wasm32-wasi \
147147
x86_64-fortanix-unknown-sgx \
148148
x86_64-fuchsia \
149149
x86_64-pc-windows-gnu \
150+
x86_64-unknown-illumos \
150151
x86_64-unknown-linux-gnux32 \
151152
x86_64-unknown-redox \
152153
"
153154

154-
RUST_OSX_TARGETS="\
155+
RUST_APPLE_TARGETS="\
155156
aarch64-apple-ios \
156157
x86_64-apple-darwin \
157158
x86_64-apple-ios \
158159
"
159160

161+
RUST_NIGHTLY_APPLE_TARGETS="\
162+
aarch64-apple-darwin \
163+
"
164+
160165
# The targets are listed here alphabetically
161166
TARGETS=""
162167
case "${OS}" in
@@ -179,7 +184,12 @@ case "${OS}" in
179184

180185
;;
181186
macos*)
182-
TARGETS="${RUST_OSX_TARGETS}"
187+
TARGETS="${RUST_APPLE_TARGETS}"
188+
189+
if [ "${RUST}" = "nightly" ]; then
190+
TARGETS="${TARGETS} ${RUST_NIGHTLY_APPLE_TARGETS}"
191+
fi
192+
183193
;;
184194
*)
185195
;;
@@ -200,9 +210,11 @@ aarch64-unknown-freebsd \
200210
aarch64-unknown-hermit \
201211
aarch64-unknown-netbsd \
202212
aarch64-unknown-openbsd \
213+
aarch64-wrs-vxworks \
203214
armebv7r-none-eabi \
204215
armebv7r-none-eabihf \
205216
armv7-unknown-cloudabi-eabihf \
217+
armv7-wrs-vxworks-eabihf \
206218
armv7r-none-eabi \
207219
armv7r-none-eabihf \
208220
hexagon-unknown-linux-musl \
@@ -212,6 +224,7 @@ i686-unknown-cloudabi \
212224
i686-unknown-haiku \
213225
i686-unknown-netbsd \
214226
i686-unknown-openbsd \
227+
i686-wrs-vxworks \
215228
mips-unknown-linux-uclibc \
216229
mipsel-sony-psp \
217230
mipsel-unknown-linux-uclibc \
@@ -220,7 +233,10 @@ mips64el-unknown-linux-muslabi64 \
220233
nvptx64-nvidia-cuda \
221234
powerpc-unknown-linux-gnuspe \
222235
powerpc-unknown-netbsd \
236+
powerpc-wrs-vxworks \
237+
powerpc-wrs-vxworks-spe \
223238
powerpc64-unknown-freebsd \
239+
powerpc64-wrs-vxworks \
224240
riscv32i-unknown-none-elf \
225241
riscv32imac-unknown-none-elf \
226242
riscv32imc-unknown-none-elf \
@@ -243,13 +259,7 @@ x86_64-unknown-haiku \
243259
x86_64-unknown-hermit \
244260
x86_64-unknown-l4re-uclibc \
245261
x86_64-unknown-openbsd \
246-
armv7-wrs-vxworks-eabihf \
247-
aarch64-wrs-vxworks \
248-
i686-wrs-vxworks \
249262
x86_64-wrs-vxworks \
250-
powerpc-wrs-vxworks \
251-
powerpc-wrs-vxworks-spe \
252-
powerpc64-wrs-vxworks \
253263
"
254264

255265
if [ "${RUST}" = "nightly" ] && [ "${OS}" = "linux" ]; then
@@ -263,8 +273,8 @@ fi
263273
RUST_OSX_NO_CORE_TARGETS="\
264274
armv7-apple-ios \
265275
armv7s-apple-ios \
266-
i386-apple-ios \
267276
i686-apple-darwin \
277+
i386-apple-ios \
268278
"
269279

270280
if [ "${RUST}" = "nightly" ] && [ "${OS}" = "macos" ]; then

0 commit comments

Comments
 (0)