From e234a901b6594ee90654f0b74cd1cf7948fab6e0 Mon Sep 17 00:00:00 2001 From: John Erickson Date: Mon, 6 May 2019 09:53:20 -0700 Subject: [PATCH] Disable 32-bit OSX --- .azure-pipelines/auto.yml | 60 +++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/.azure-pipelines/auto.yml b/.azure-pipelines/auto.yml index 818b613740e..2cefa5993a8 100644 --- a/.azure-pipelines/auto.yml +++ b/.azure-pipelines/auto.yml @@ -167,15 +167,6 @@ jobs: - template: steps/macos.yml strategy: matrix: - dist-x86_64-apple-alt: - RUST_CHECK_TARGET: dist - RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --enable-lldb --set rust.jemalloc - DEPLOY_ALT: 1 - RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 - MACOSX_DEPLOYMENT_TARGET: 10.7 - NO_LLVM_ASSERTIONS: 1 - NO_DEBUG_ASSERTIONS: 1 - # macOS builders. These are placed near the beginning because they are very # slow to run. @@ -194,25 +185,6 @@ jobs: NO_LLVM_ASSERTIONS: 1 NO_DEBUG_ASSERTIONS: 1 - i686-apple: - RUST_CHECK_TARGET: check - RUST_CONFIGURE_ARGS: --build=i686-apple-darwin --set rust.jemalloc - RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 - MACOSX_DEPLOYMENT_TARGET: 10.8 - MACOSX_STD_DEPLOYMENT_TARGET: 10.7 - NO_LLVM_ASSERTIONS: 1 - NO_DEBUG_ASSERTIONS: 1 - - dist-i686-apple: - RUST_CHECK_TARGET: dist - RUST_CONFIGURE_ARGS: --build=i686-apple-darwin --enable-full-tools --enable-profiler --enable-lldb --set rust.jemalloc - DEPLOY: 1 - RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 - MACOSX_DEPLOYMENT_TARGET: 10.7 - NO_LLVM_ASSERTIONS: 1 - NO_DEBUG_ASSERTIONS: 1 - DIST_REQUIRE_ALL_TOOLS: 1 - dist-x86_64-apple: RUST_CHECK_TARGET: dist RUST_CONFIGURE_ARGS: --target=aarch64-apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --enable-lldb --set rust.jemalloc @@ -223,6 +195,38 @@ jobs: NO_DEBUG_ASSERTIONS: 1 DIST_REQUIRE_ALL_TOOLS: 1 + dist-x86_64-apple-alt: + RUST_CHECK_TARGET: dist + RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --enable-lldb --set rust.jemalloc + DEPLOY_ALT: 1 + RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 + MACOSX_DEPLOYMENT_TARGET: 10.7 + NO_LLVM_ASSERTIONS: 1 + NO_DEBUG_ASSERTIONS: 1 + + # # temp disabled + # # https://github.com/johnterickson/rust/issues/18 + # i686-apple: + # RUST_CHECK_TARGET: check + # RUST_CONFIGURE_ARGS: --build=i686-apple-darwin --set rust.jemalloc + # RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 + # MACOSX_DEPLOYMENT_TARGET: 10.8 + # MACOSX_STD_DEPLOYMENT_TARGET: 10.7 + # NO_LLVM_ASSERTIONS: 1 + # NO_DEBUG_ASSERTIONS: 1 + + # dist-i686-apple: + # RUST_CHECK_TARGET: dist + # RUST_CONFIGURE_ARGS: --build=i686-apple-darwin --enable-full-tools --enable-profiler --enable-lldb --set rust.jemalloc + # DEPLOY: 1 + # RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 + # MACOSX_DEPLOYMENT_TARGET: 10.7 + # NO_LLVM_ASSERTIONS: 1 + # NO_DEBUG_ASSERTIONS: 1 + # DIST_REQUIRE_ALL_TOOLS: 1 + + + - job: Windows timeoutInMinutes: 600 pool: