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.

ci/build.sh

@@ -147,16 +147,21 @@ wasm32-wasi \
 x86_64-fortanix-unknown-sgx \
 x86_64-fuchsia \
 x86_64-pc-windows-gnu \
+x86_64-unknown-illumos \
 x86_64-unknown-linux-gnux32 \
 x86_64-unknown-redox \
 "
 
-RUST_OSX_TARGETS="\
+RUST_APPLE_TARGETS="\
 aarch64-apple-ios \
 x86_64-apple-darwin \
 x86_64-apple-ios \
 "
 
+RUST_NIGHTLY_APPLE_TARGETS="\
+aarch64-apple-darwin \
+"
+
 # The targets are listed here alphabetically
 TARGETS=""
 case "${OS}" in
@@ -179,7 +184,12 @@ case "${OS}" in
 
         ;;
     macos*)
-        TARGETS="${RUST_OSX_TARGETS}"
+        TARGETS="${RUST_APPLE_TARGETS}"
+
+        if [ "${RUST}" = "nightly" ]; then
+            TARGETS="${TARGETS} ${RUST_NIGHTLY_APPLE_TARGETS}"
+        fi
+
         ;;
     *)
         ;;
@@ -200,9 +210,11 @@ aarch64-unknown-freebsd \
 aarch64-unknown-hermit \
 aarch64-unknown-netbsd \
 aarch64-unknown-openbsd \
+aarch64-wrs-vxworks \
 armebv7r-none-eabi \
 armebv7r-none-eabihf \
 armv7-unknown-cloudabi-eabihf \
+armv7-wrs-vxworks-eabihf \
 armv7r-none-eabi \
 armv7r-none-eabihf \
 hexagon-unknown-linux-musl \
@@ -212,6 +224,7 @@ i686-unknown-cloudabi \
 i686-unknown-haiku \
 i686-unknown-netbsd \
 i686-unknown-openbsd \
+i686-wrs-vxworks \
 mips-unknown-linux-uclibc \
 mipsel-sony-psp \
 mipsel-unknown-linux-uclibc \
@@ -220,7 +233,10 @@ mips64el-unknown-linux-muslabi64 \
 nvptx64-nvidia-cuda \
 powerpc-unknown-linux-gnuspe \
 powerpc-unknown-netbsd \
+powerpc-wrs-vxworks \
+powerpc-wrs-vxworks-spe \
 powerpc64-unknown-freebsd \
+powerpc64-wrs-vxworks \
 riscv32i-unknown-none-elf \
 riscv32imac-unknown-none-elf \
 riscv32imc-unknown-none-elf \
@@ -243,13 +259,7 @@ x86_64-unknown-haiku \
 x86_64-unknown-hermit \
 x86_64-unknown-l4re-uclibc \
 x86_64-unknown-openbsd \
-armv7-wrs-vxworks-eabihf \
-aarch64-wrs-vxworks \
-i686-wrs-vxworks \
 x86_64-wrs-vxworks \
-powerpc-wrs-vxworks \
-powerpc-wrs-vxworks-spe \
-powerpc64-wrs-vxworks \
 "
 
 if [ "${RUST}" = "nightly" ] && [ "${OS}" = "linux" ]; then
@@ -263,8 +273,8 @@ fi
 RUST_OSX_NO_CORE_TARGETS="\
 armv7-apple-ios \
 armv7s-apple-ios \
-i386-apple-ios \
 i686-apple-darwin \
+i386-apple-ios \
 "
 
 if [ "${RUST}" = "nightly" ] && [ "${OS}" = "macos" ]; then