diff --git a/ci/azure.yml b/ci/azure.yml index da25a268db622654a6ba216fb1681a87b41a4943..5672e3d6046e07fe449f35dcc5f2acd391cf6d6b 100644 --- a/ci/azure.yml +++ b/ci/azure.yml @@ -99,18 +99,6 @@ jobs: x86_64-apple-darwin: TARGET: x86_64-apple-darwin - - job: DockerOSX32 - pool: - vmImage: macos-10.13 - steps: - - template: azure-install-rust.yml - - bash: LIBC_CI=1 sh ./ci/run.sh $TARGET - displayName: Execute run.sh - strategy: - matrix: - i686-apple-darwin: - TARGET: i686-apple-darwin - - job: Windows pool: vmImage: vs2017-win2016 diff --git a/ci/build.sh b/ci/build.sh index 082f0dc6833932444cf253f95741a1b4e34967ef..0e8468734af6f16534ff20d904e445ed05babdf8 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -147,12 +147,15 @@ x86_64-unknown-linux-gnux32 \ RUST_OSX_TARGETS="\ aarch64-apple-ios \ +x86_64-apple-darwin \ +x86_64-apple-ios \ +" + +RUST_LT_1_42_OSX_TARGETS="\ armv7-apple-ios \ armv7s-apple-ios \ i386-apple-ios \ i686-apple-darwin \ -x86_64-apple-darwin \ -x86_64-apple-ios \ " # The targets are listed here alphabetically @@ -178,6 +181,12 @@ case "${OS}" in ;; osx*) TARGETS="${RUST_OSX_TARGETS}" + + if [ "${RUST}" != "nightly" ]; then + if [ "${RUST}" != "beta" ]; then + TARGETS="${TARGETS} ${RUST_LT_1_42_OSX_TARGETS}" + fi + fi ;; *) ;;