From a90003f62d0352d08d4d5b4272bac3ddc3fdd0bb Mon Sep 17 00:00:00 2001 From: Matt Cooper Date: Tue, 10 Mar 2020 13:46:39 -0400 Subject: [PATCH 01/23] establish immutable source for RUST_CONFIGURE_ARGS --- src/ci/azure-pipelines/auto.yml | 38 ++++++++++++++--------------- src/ci/azure-pipelines/try.yml | 8 +++--- src/ci/scripts/setup-environment.sh | 7 ++++++ 3 files changed, 30 insertions(+), 23 deletions(-) diff --git a/src/ci/azure-pipelines/auto.yml b/src/ci/azure-pipelines/auto.yml index 74b7469ea27b7..f00d3c6da62db 100644 --- a/src/ci/azure-pipelines/auto.yml +++ b/src/ci/azure-pipelines/auto.yml @@ -76,7 +76,7 @@ jobs: # version that we're using, 8.2, cannot compile LLVM for OSX 10.7. x86_64-apple: SCRIPT: ./x.py test - RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc + INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 MACOSX_DEPLOYMENT_TARGET: 10.8 MACOSX_STD_DEPLOYMENT_TARGET: 10.7 @@ -85,7 +85,7 @@ jobs: dist-x86_64-apple: SCRIPT: ./x.py dist - RUST_CONFIGURE_ARGS: --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc + IINTIAL_RUST_CONFIGURE_ARGS: --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 MACOSX_DEPLOYMENT_TARGET: 10.7 NO_LLVM_ASSERTIONS: 1 @@ -94,7 +94,7 @@ jobs: dist-x86_64-apple-alt: SCRIPT: ./x.py dist - RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --set rust.jemalloc + INITIAL_RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --set rust.jemalloc RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 MACOSX_DEPLOYMENT_TARGET: 10.7 NO_LLVM_ASSERTIONS: 1 @@ -111,22 +111,22 @@ jobs: matrix: # 32/64 bit MSVC tests x86_64-msvc-1: - RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler + INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler SCRIPT: make ci-subset-1 # FIXME(#59637) NO_DEBUG_ASSERTIONS: 1 NO_LLVM_ASSERTIONS: 1 x86_64-msvc-2: - RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler + INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler SCRIPT: make ci-subset-2 i686-msvc-1: - RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc + INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc SCRIPT: make ci-subset-1 # FIXME(#59637) NO_DEBUG_ASSERTIONS: 1 NO_LLVM_ASSERTIONS: 1 i686-msvc-2: - RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc + INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc SCRIPT: make ci-subset-2 # FIXME(#59637) NO_DEBUG_ASSERTIONS: 1 @@ -134,10 +134,10 @@ jobs: # MSVC aux tests x86_64-msvc-aux: RUST_CHECK_TARGET: check-aux EXCLUDE_CARGO=1 - RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc + INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc x86_64-msvc-cargo: SCRIPT: python x.py test src/tools/cargotest src/tools/cargo - RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc + INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc VCVARS_BAT: vcvars64.bat # FIXME(#59637) NO_DEBUG_ASSERTIONS: 1 @@ -145,7 +145,7 @@ jobs: # MSVC tools tests x86_64-msvc-tools: SCRIPT: src/ci/docker/x86_64-gnu-tools/checktools.sh x.py - RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstate/toolstates.json + INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstate/toolstates.json # 32/64-bit MinGW builds. # @@ -161,31 +161,31 @@ jobs: # came from the mingw-w64 SourceForge download site. Unfortunately # SourceForge is notoriously flaky, so we mirror it on our own infrastructure. i686-mingw-1: - RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu + INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu SCRIPT: make ci-mingw-subset-1 CUSTOM_MINGW: 1 # FIXME(#59637) NO_DEBUG_ASSERTIONS: 1 NO_LLVM_ASSERTIONS: 1 i686-mingw-2: - RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu + INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu SCRIPT: make ci-mingw-subset-2 CUSTOM_MINGW: 1 x86_64-mingw-1: SCRIPT: make ci-mingw-subset-1 - RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu + INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu CUSTOM_MINGW: 1 # FIXME(#59637) NO_DEBUG_ASSERTIONS: 1 NO_LLVM_ASSERTIONS: 1 x86_64-mingw-2: SCRIPT: make ci-mingw-subset-2 - RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu + INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu CUSTOM_MINGW: 1 # 32/64 bit MSVC and GNU deployment dist-x86_64-msvc: - RUST_CONFIGURE_ARGS: >- + INITIAL_RUST_CONFIGURE_ARGS: >- --build=x86_64-pc-windows-msvc --target=x86_64-pc-windows-msvc,aarch64-pc-windows-msvc --enable-full-tools @@ -193,7 +193,7 @@ jobs: SCRIPT: python x.py dist DIST_REQUIRE_ALL_TOOLS: 1 dist-i686-msvc: - RUST_CONFIGURE_ARGS: >- + INITIAL_RUST_CONFIGURE_ARGS: >- --build=i686-pc-windows-msvc --target=i586-pc-windows-msvc --enable-full-tools @@ -201,17 +201,17 @@ jobs: SCRIPT: python x.py dist DIST_REQUIRE_ALL_TOOLS: 1 dist-i686-mingw: - RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-full-tools --enable-profiler + INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-full-tools --enable-profiler SCRIPT: python x.py dist CUSTOM_MINGW: 1 DIST_REQUIRE_ALL_TOOLS: 1 dist-x86_64-mingw: SCRIPT: python x.py dist - RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler + INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler CUSTOM_MINGW: 1 DIST_REQUIRE_ALL_TOOLS: 1 # "alternate" deployment, see .travis.yml for more info dist-x86_64-msvc-alt: - RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler + INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler SCRIPT: python x.py dist diff --git a/src/ci/azure-pipelines/try.yml b/src/ci/azure-pipelines/try.yml index a29d6f9ae1ec6..698608795e24d 100644 --- a/src/ci/azure-pipelines/try.yml +++ b/src/ci/azure-pipelines/try.yml @@ -32,7 +32,7 @@ jobs: # matrix: # dist-x86_64-apple: # SCRIPT: ./x.py 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 --set rust.jemalloc +# INITIAL_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 --set rust.jemalloc # DEPLOY: 1 # RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 # MACOSX_DEPLOYMENT_TARGET: 10.7 @@ -42,7 +42,7 @@ jobs: # # dist-x86_64-apple-alt: # SCRIPT: ./x.py dist -# RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --set rust.jemalloc +# INITIAL_RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --set rust.jemalloc # DEPLOY_ALT: 1 # RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 # MACOSX_DEPLOYMENT_TARGET: 10.7 @@ -58,7 +58,7 @@ jobs: # strategy: # matrix: # dist-x86_64-msvc: -# RUST_CONFIGURE_ARGS: > +# INITIAL_RUST_CONFIGURE_ARGS: > # --build=x86_64-pc-windows-msvc # --target=x86_64-pc-windows-msvc,aarch64-pc-windows-msvc # --enable-full-tools @@ -68,6 +68,6 @@ jobs: # DEPLOY: 1 # # dist-x86_64-msvc-alt: -# RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler +# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler # SCRIPT: python x.py dist # DEPLOY_ALT: 1 diff --git a/src/ci/scripts/setup-environment.sh b/src/ci/scripts/setup-environment.sh index e126a06edab73..9fd07a37fcc48 100755 --- a/src/ci/scripts/setup-environment.sh +++ b/src/ci/scripts/setup-environment.sh @@ -8,6 +8,13 @@ IFS=$'\n\t' source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" +# Since matrix variables are readonly in Azure Pipelines, we take +# INITIAL_RUST_CONFIGURE_ARGS and establish RUST_CONFIGURE_ARGS +# which downstream steps can alter +if [[ -n "${INITIAL_RUST_CONFIGURE_ARGS}" ]]; then + ciCommandSetEnv RUST_CONFIGURE_ARGS "${INITIAL_RUST_CONFIGURE_ARGS}" +fi + # Builders starting with `dist-` are dist builders, but if they also end with # `-alt` they are alternate dist builders. if [[ "${CI_JOB_NAME}" = dist-* ]]; then From d8619bc20c4328634a62b14b745405c2a1c1e7cc Mon Sep 17 00:00:00 2001 From: Matt Cooper Date: Tue, 10 Mar 2020 14:13:39 -0400 Subject: [PATCH 02/23] fix how we detect an unset variable --- src/ci/scripts/setup-environment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ci/scripts/setup-environment.sh b/src/ci/scripts/setup-environment.sh index 9fd07a37fcc48..4f7641d50face 100755 --- a/src/ci/scripts/setup-environment.sh +++ b/src/ci/scripts/setup-environment.sh @@ -11,7 +11,7 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" # Since matrix variables are readonly in Azure Pipelines, we take # INITIAL_RUST_CONFIGURE_ARGS and establish RUST_CONFIGURE_ARGS # which downstream steps can alter -if [[ -n "${INITIAL_RUST_CONFIGURE_ARGS}" ]]; then +if [[ -v INITIAL_RUST_CONFIGURE_ARGS ]]; then ciCommandSetEnv RUST_CONFIGURE_ARGS "${INITIAL_RUST_CONFIGURE_ARGS}" fi From d25767f687a5f9e89e44ae8662788360ac9eec01 Mon Sep 17 00:00:00 2001 From: Nell Shamrell Date: Thu, 12 Mar 2020 14:18:11 -0700 Subject: [PATCH 03/23] temporarily run all builds in try pipeline Signed-off-by: Nell Shamrell --- src/ci/azure-pipelines/try.yml | 194 +++++++++++++++++++++++++++++++++ 1 file changed, 194 insertions(+) diff --git a/src/ci/azure-pipelines/try.yml b/src/ci/azure-pipelines/try.yml index 698608795e24d..38ac7d8631406 100644 --- a/src/ci/azure-pipelines/try.yml +++ b/src/ci/azure-pipelines/try.yml @@ -14,9 +14,203 @@ jobs: - template: steps/run.yml strategy: matrix: + x86_64-gnu-llvm-7: + RUST_BACKTRACE: 1 dist-x86_64-linux: {} dist-x86_64-linux-alt: IMAGE: dist-x86_64-linux + arm-android: {} + armhf-gnu: {} + dist-various-1: {} + dist-various-2: {} + dist-aarch64-linux: {} + dist-android: {} + dist-arm-linux: {} + dist-armhf-linux: {} + dist-armv7-linux: {} + dist-i586-gnu-i586-i686-musl: {} + dist-i686-freebsd: {} + dist-i686-linux: {} + dist-mips-linux: {} + dist-mips64-linux: {} + dist-mips64el-linux: {} + dist-mipsel-linux: {} + dist-powerpc-linux: {} + dist-powerpc64-linux: {} + dist-powerpc64le-linux: {} + dist-s390x-linux: {} + dist-x86_64-freebsd: {} + dist-x86_64-musl: {} + dist-x86_64-netbsd: {} + i686-gnu: {} + i686-gnu-nopt: {} + test-various: {} + wasm32: {} + x86_64-gnu: {} + x86_64-gnu-full-bootstrap: {} + x86_64-gnu-aux: {} + x86_64-gnu-tools: + DEPLOY_TOOLSTATES_JSON: toolstates-linux.json + x86_64-gnu-debug: {} + x86_64-gnu-nopt: {} + x86_64-gnu-distcheck: {} + mingw-check: {} + +- job: macOS + timeoutInMinutes: 600 + pool: + vmImage: macos-10.15 + steps: + - template: steps/run.yml + strategy: + matrix: + # OSX builders running tests, these run the full test suite. + # NO_DEBUG_ASSERTIONS=1 to make them go faster, but also do have some + # runners that run `//ignore-debug` tests. + # + # Note that the compiler is compiled to target 10.8 here because the Xcode + # version that we're using, 8.2, cannot compile LLVM for OSX 10.7. + x86_64-apple: + SCRIPT: ./x.py test + INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --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-x86_64-apple: + SCRIPT: ./x.py dist + IINTIAL_RUST_CONFIGURE_ARGS: --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc + 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-alt: + SCRIPT: ./x.py dist + INITIAL_RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --set rust.jemalloc + RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 + MACOSX_DEPLOYMENT_TARGET: 10.7 + NO_LLVM_ASSERTIONS: 1 + NO_DEBUG_ASSERTIONS: 1 + + +- job: Windows + timeoutInMinutes: 600 + pool: + vmImage: 'vs2017-win2016' + steps: + - template: steps/run.yml + strategy: + matrix: + # 32/64 bit MSVC tests + x86_64-msvc-1: + INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler + SCRIPT: make ci-subset-1 + # FIXME(#59637) + NO_DEBUG_ASSERTIONS: 1 + NO_LLVM_ASSERTIONS: 1 + x86_64-msvc-2: + INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler + SCRIPT: make ci-subset-2 + i686-msvc-1: + INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc + SCRIPT: make ci-subset-1 + # FIXME(#59637) + NO_DEBUG_ASSERTIONS: 1 + NO_LLVM_ASSERTIONS: 1 + i686-msvc-2: + INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc + SCRIPT: make ci-subset-2 + # FIXME(#59637) + NO_DEBUG_ASSERTIONS: 1 + NO_LLVM_ASSERTIONS: 1 + # MSVC aux tests + x86_64-msvc-aux: + RUST_CHECK_TARGET: check-aux EXCLUDE_CARGO=1 + INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc + x86_64-msvc-cargo: + SCRIPT: python x.py test src/tools/cargotest src/tools/cargo + INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc + VCVARS_BAT: vcvars64.bat + # FIXME(#59637) + NO_DEBUG_ASSERTIONS: 1 + NO_LLVM_ASSERTIONS: 1 + # MSVC tools tests + x86_64-msvc-tools: + SCRIPT: src/ci/docker/x86_64-gnu-tools/checktools.sh x.py + INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstate/toolstates.json + + # 32/64-bit MinGW builds. + # + # We are using MinGW with posix threads since LLVM does not compile with + # the win32 threads version due to missing support for C++'s std::thread. + # + # Instead of relying on the MinGW version installed on appveryor we download + # and install one ourselves so we won't be surprised by changes to appveyor's + # build image. + # + # Finally, note that the downloads below are all in the `rust-lang-ci` S3 + # bucket, but they cleraly didn't originate there! The downloads originally + # came from the mingw-w64 SourceForge download site. Unfortunately + # SourceForge is notoriously flaky, so we mirror it on our own infrastructure. + i686-mingw-1: + INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu + SCRIPT: make ci-mingw-subset-1 + CUSTOM_MINGW: 1 + # FIXME(#59637) + NO_DEBUG_ASSERTIONS: 1 + NO_LLVM_ASSERTIONS: 1 + i686-mingw-2: + INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu + SCRIPT: make ci-mingw-subset-2 + CUSTOM_MINGW: 1 + x86_64-mingw-1: + SCRIPT: make ci-mingw-subset-1 + INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu + CUSTOM_MINGW: 1 + # FIXME(#59637) + NO_DEBUG_ASSERTIONS: 1 + NO_LLVM_ASSERTIONS: 1 + x86_64-mingw-2: + SCRIPT: make ci-mingw-subset-2 + INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu + CUSTOM_MINGW: 1 + + # 32/64 bit MSVC and GNU deployment + dist-x86_64-msvc: + INITIAL_RUST_CONFIGURE_ARGS: >- + --build=x86_64-pc-windows-msvc + --target=x86_64-pc-windows-msvc,aarch64-pc-windows-msvc + --enable-full-tools + --enable-profiler + SCRIPT: python x.py dist + DIST_REQUIRE_ALL_TOOLS: 1 + dist-i686-msvc: + INITIAL_RUST_CONFIGURE_ARGS: >- + --build=i686-pc-windows-msvc + --target=i586-pc-windows-msvc + --enable-full-tools + --enable-profiler + SCRIPT: python x.py dist + DIST_REQUIRE_ALL_TOOLS: 1 + dist-i686-mingw: + INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-full-tools --enable-profiler + SCRIPT: python x.py dist + CUSTOM_MINGW: 1 + DIST_REQUIRE_ALL_TOOLS: 1 + dist-x86_64-mingw: + SCRIPT: python x.py dist + INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler + CUSTOM_MINGW: 1 + DIST_REQUIRE_ALL_TOOLS: 1 + + # "alternate" deployment, see .travis.yml for more info + dist-x86_64-msvc-alt: + INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler + SCRIPT: python x.py dist # The macOS and Windows builds here are currently disabled due to them not being # overly necessary on `try` builds. We also don't actually have anything that From 960e741fc5af128c4785347bc8f4997ffdf16a6a Mon Sep 17 00:00:00 2001 From: Nell Shamrell Date: Thu, 12 Mar 2020 14:35:42 -0700 Subject: [PATCH 04/23] round 1 - running five builders Signed-off-by: Nell Shamrell --- src/ci/azure-pipelines/try.yml | 249 +++++++++++++++++---------------- 1 file changed, 125 insertions(+), 124 deletions(-) diff --git a/src/ci/azure-pipelines/try.yml b/src/ci/azure-pipelines/try.yml index 38ac7d8631406..9957c4182789e 100644 --- a/src/ci/azure-pipelines/try.yml +++ b/src/ci/azure-pipelines/try.yml @@ -14,56 +14,57 @@ jobs: - template: steps/run.yml strategy: matrix: - x86_64-gnu-llvm-7: - RUST_BACKTRACE: 1 - dist-x86_64-linux: {} - dist-x86_64-linux-alt: - IMAGE: dist-x86_64-linux - arm-android: {} - armhf-gnu: {} - dist-various-1: {} - dist-various-2: {} - dist-aarch64-linux: {} - dist-android: {} - dist-arm-linux: {} - dist-armhf-linux: {} - dist-armv7-linux: {} - dist-i586-gnu-i586-i686-musl: {} - dist-i686-freebsd: {} - dist-i686-linux: {} - dist-mips-linux: {} - dist-mips64-linux: {} - dist-mips64el-linux: {} - dist-mipsel-linux: {} - dist-powerpc-linux: {} - dist-powerpc64-linux: {} - dist-powerpc64le-linux: {} - dist-s390x-linux: {} - dist-x86_64-freebsd: {} - dist-x86_64-musl: {} - dist-x86_64-netbsd: {} - i686-gnu: {} - i686-gnu-nopt: {} - test-various: {} - wasm32: {} - x86_64-gnu: {} - x86_64-gnu-full-bootstrap: {} - x86_64-gnu-aux: {} - x86_64-gnu-tools: - DEPLOY_TOOLSTATES_JSON: toolstates-linux.json - x86_64-gnu-debug: {} - x86_64-gnu-nopt: {} - x86_64-gnu-distcheck: {} - mingw-check: {} - -- job: macOS - timeoutInMinutes: 600 - pool: - vmImage: macos-10.15 - steps: - - template: steps/run.yml - strategy: - matrix: + # Round 1 +# x86_64-gnu-llvm-7: +# RUST_BACKTRACE: 1 +# dist-x86_64-linux: {} +# dist-x86_64-linux-alt: +# IMAGE: dist-x86_64-linux +# arm-android: {} +# armhf-gnu: {} +# dist-various-1: {} +# dist-various-2: {} +# dist-aarch64-linux: {} +# dist-android: {} +# dist-arm-linux: {} +# dist-armhf-linux: {} +# dist-armv7-linux: {} +# dist-i586-gnu-i586-i686-musl: {} +# dist-i686-freebsd: {} +# dist-i686-linux: {} +# dist-mips-linux: {} +# dist-mips64-linux: {} +# dist-mips64el-linux: {} +# dist-mipsel-linux: {} +# dist-powerpc-linux: {} +# dist-powerpc64-linux: {} +# dist-powerpc64le-linux: {} +# dist-s390x-linux: {} +# dist-x86_64-freebsd: {} +# dist-x86_64-musl: {} +# dist-x86_64-netbsd: {} +# i686-gnu: {} +# i686-gnu-nopt: {} +# test-various: {} +# wasm32: {} +# x86_64-gnu: {} +# x86_64-gnu-full-bootstrap: {} +# x86_64-gnu-aux: {} +# x86_64-gnu-tools: +# DEPLOY_TOOLSTATES_JSON: toolstates-linux.json +# x86_64-gnu-debug: {} +# x86_64-gnu-nopt: {} +# x86_64-gnu-distcheck: {} +# mingw-check: {} +# +#- job: macOS +# timeoutInMinutes: 600 +# pool: +# vmImage: macos-10.15 +# steps: +# - template: steps/run.yml +# strategy: +# matrix: # OSX builders running tests, these run the full test suite. # NO_DEBUG_ASSERTIONS=1 to make them go faster, but also do have some # runners that run `//ignore-debug` tests. @@ -81,7 +82,7 @@ jobs: dist-x86_64-apple: SCRIPT: ./x.py dist - IINTIAL_RUST_CONFIGURE_ARGS: --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc + INITIAL_RUST_CONFIGURE_ARGS: --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 MACOSX_DEPLOYMENT_TARGET: 10.7 NO_LLVM_ASSERTIONS: 1 @@ -105,7 +106,7 @@ jobs: - template: steps/run.yml strategy: matrix: - # 32/64 bit MSVC tests + # 32/64 bit MSVC tests x86_64-msvc-1: INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler SCRIPT: make ci-subset-1 @@ -115,33 +116,33 @@ jobs: x86_64-msvc-2: INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler SCRIPT: make ci-subset-2 - i686-msvc-1: - INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc - SCRIPT: make ci-subset-1 +# i686-msvc-1: +# INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc +# SCRIPT: make ci-subset-1 # FIXME(#59637) - NO_DEBUG_ASSERTIONS: 1 - NO_LLVM_ASSERTIONS: 1 - i686-msvc-2: - INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc - SCRIPT: make ci-subset-2 +# NO_DEBUG_ASSERTIONS: 1 +# NO_LLVM_ASSERTIONS: 1 +# i686-msvc-2: +# INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc +# SCRIPT: make ci-subset-2 # FIXME(#59637) - NO_DEBUG_ASSERTIONS: 1 - NO_LLVM_ASSERTIONS: 1 +# NO_DEBUG_ASSERTIONS: 1 +# NO_LLVM_ASSERTIONS: 1 # MSVC aux tests - x86_64-msvc-aux: - RUST_CHECK_TARGET: check-aux EXCLUDE_CARGO=1 - INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc - x86_64-msvc-cargo: - SCRIPT: python x.py test src/tools/cargotest src/tools/cargo - INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc - VCVARS_BAT: vcvars64.bat +# x86_64-msvc-aux: +# RUST_CHECK_TARGET: check-aux EXCLUDE_CARGO=1 +# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc +# x86_64-msvc-cargo: +# SCRIPT: python x.py test src/tools/cargotest src/tools/cargo +# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc +# VCVARS_BAT: vcvars64.bat # FIXME(#59637) - NO_DEBUG_ASSERTIONS: 1 - NO_LLVM_ASSERTIONS: 1 +# NO_DEBUG_ASSERTIONS: 1 +# NO_LLVM_ASSERTIONS: 1 # MSVC tools tests - x86_64-msvc-tools: - SCRIPT: src/ci/docker/x86_64-gnu-tools/checktools.sh x.py - INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstate/toolstates.json +# x86_64-msvc-tools: +# SCRIPT: src/ci/docker/x86_64-gnu-tools/checktools.sh x.py +# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstate/toolstates.json # 32/64-bit MinGW builds. # @@ -156,62 +157,62 @@ jobs: # bucket, but they cleraly didn't originate there! The downloads originally # came from the mingw-w64 SourceForge download site. Unfortunately # SourceForge is notoriously flaky, so we mirror it on our own infrastructure. - i686-mingw-1: - INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu - SCRIPT: make ci-mingw-subset-1 - CUSTOM_MINGW: 1 +# i686-mingw-1: +# INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu +# SCRIPT: make ci-mingw-subset-1 +# CUSTOM_MINGW: 1 # FIXME(#59637) - NO_DEBUG_ASSERTIONS: 1 - NO_LLVM_ASSERTIONS: 1 - i686-mingw-2: - INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu - SCRIPT: make ci-mingw-subset-2 - CUSTOM_MINGW: 1 - x86_64-mingw-1: - SCRIPT: make ci-mingw-subset-1 - INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu - CUSTOM_MINGW: 1 +# NO_DEBUG_ASSERTIONS: 1 +# NO_LLVM_ASSERTIONS: 1 +# i686-mingw-2: +# INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu +# SCRIPT: make ci-mingw-subset-2 +# CUSTOM_MINGW: 1 +# x86_64-mingw-1: +# SCRIPT: make ci-mingw-subset-1 +# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu +# CUSTOM_MINGW: 1 # FIXME(#59637) - NO_DEBUG_ASSERTIONS: 1 - NO_LLVM_ASSERTIONS: 1 - x86_64-mingw-2: - SCRIPT: make ci-mingw-subset-2 - INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu - CUSTOM_MINGW: 1 +# NO_DEBUG_ASSERTIONS: 1 +# NO_LLVM_ASSERTIONS: 1 +# x86_64-mingw-2: +# SCRIPT: make ci-mingw-subset-2 +# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu +# CUSTOM_MINGW: 1 # 32/64 bit MSVC and GNU deployment - dist-x86_64-msvc: - INITIAL_RUST_CONFIGURE_ARGS: >- - --build=x86_64-pc-windows-msvc - --target=x86_64-pc-windows-msvc,aarch64-pc-windows-msvc - --enable-full-tools - --enable-profiler - SCRIPT: python x.py dist - DIST_REQUIRE_ALL_TOOLS: 1 - dist-i686-msvc: - INITIAL_RUST_CONFIGURE_ARGS: >- - --build=i686-pc-windows-msvc - --target=i586-pc-windows-msvc - --enable-full-tools - --enable-profiler - SCRIPT: python x.py dist - DIST_REQUIRE_ALL_TOOLS: 1 - dist-i686-mingw: - INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-full-tools --enable-profiler - SCRIPT: python x.py dist - CUSTOM_MINGW: 1 - DIST_REQUIRE_ALL_TOOLS: 1 - dist-x86_64-mingw: - SCRIPT: python x.py dist - INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler - CUSTOM_MINGW: 1 - DIST_REQUIRE_ALL_TOOLS: 1 +# dist-x86_64-msvc: +# INITIAL_RUST_CONFIGURE_ARGS: >- +# --build=x86_64-pc-windows-msvc +# --target=x86_64-pc-windows-msvc,aarch64-pc-windows-msvc +# --enable-full-tools +# --enable-profiler +# SCRIPT: python x.py dist +# DIST_REQUIRE_ALL_TOOLS: 1 +# dist-i686-msvc: +# INITIAL_RUST_CONFIGURE_ARGS: >- +# --build=i686-pc-windows-msvc +# --target=i586-pc-windows-msvc +# --enable-full-tools +# --enable-profiler +# SCRIPT: python x.py dist +# DIST_REQUIRE_ALL_TOOLS: 1 +# dist-i686-mingw: +# INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-full-tools --enable-profiler +# SCRIPT: python x.py dist +# CUSTOM_MINGW: 1 +# DIST_REQUIRE_ALL_TOOLS: 1 +# dist-x86_64-mingw: +# SCRIPT: python x.py dist +# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler +# CUSTOM_MINGW: 1 +# DIST_REQUIRE_ALL_TOOLS: 1 # "alternate" deployment, see .travis.yml for more info - dist-x86_64-msvc-alt: - INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler - SCRIPT: python x.py dist - +# dist-x86_64-msvc-alt: +# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler +# SCRIPT: python x.py dist +# # The macOS and Windows builds here are currently disabled due to them not being # overly necessary on `try` builds. We also don't actually have anything that # consumes the artifacts currently. Perhaps one day we can re-enable, but for now From 9e2dc2487073b3be8e901d4fac51a3aaba771b67 Mon Sep 17 00:00:00 2001 From: Nell Shamrell Date: Fri, 13 Mar 2020 17:06:41 -0700 Subject: [PATCH 05/23] run different subset of builds Signed-off-by: Nell Shamrell --- src/ci/azure-pipelines/try.yml | 50 +++++++++++++++++----------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/src/ci/azure-pipelines/try.yml b/src/ci/azure-pipelines/try.yml index 9957c4182789e..90aa2620f6433 100644 --- a/src/ci/azure-pipelines/try.yml +++ b/src/ci/azure-pipelines/try.yml @@ -57,14 +57,14 @@ jobs: # x86_64-gnu-distcheck: {} # mingw-check: {} # -#- job: macOS -# timeoutInMinutes: 600 -# pool: -# vmImage: macos-10.15 -# steps: -# - template: steps/run.yml -# strategy: -# matrix: +- job: macOS + timeoutInMinutes: 600 + pool: + vmImage: macos-10.15 + steps: + - template: steps/run.yml + strategy: + matrix: # OSX builders running tests, these run the full test suite. # NO_DEBUG_ASSERTIONS=1 to make them go faster, but also do have some # runners that run `//ignore-debug` tests. @@ -107,27 +107,27 @@ jobs: strategy: matrix: # 32/64 bit MSVC tests - x86_64-msvc-1: - INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler - SCRIPT: make ci-subset-1 - # FIXME(#59637) - NO_DEBUG_ASSERTIONS: 1 - NO_LLVM_ASSERTIONS: 1 - x86_64-msvc-2: - INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler - SCRIPT: make ci-subset-2 -# i686-msvc-1: -# INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc +# x86_64-msvc-1: +# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler # SCRIPT: make ci-subset-1 - # FIXME(#59637) +# # FIXME(#59637) # NO_DEBUG_ASSERTIONS: 1 # NO_LLVM_ASSERTIONS: 1 -# i686-msvc-2: -# INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc +# x86_64-msvc-2: +# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler # SCRIPT: make ci-subset-2 - # FIXME(#59637) -# NO_DEBUG_ASSERTIONS: 1 -# NO_LLVM_ASSERTIONS: 1 + i686-msvc-1: + INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc + SCRIPT: make ci-subset-1 + # FIXME(#59637) + NO_DEBUG_ASSERTIONS: 1 + NO_LLVM_ASSERTIONS: 1 + i686-msvc-2: + INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc + SCRIPT: make ci-subset-2 + # FIXME(#59637) + NO_DEBUG_ASSERTIONS: 1 + NO_LLVM_ASSERTIONS: 1 # MSVC aux tests # x86_64-msvc-aux: # RUST_CHECK_TARGET: check-aux EXCLUDE_CARGO=1 From 7fe5d44ab5f4dfcdb827f3ec688a5eb7e20a0351 Mon Sep 17 00:00:00 2001 From: Nell Shamrell Date: Mon, 16 Mar 2020 09:38:21 -0700 Subject: [PATCH 06/23] comment out linux jobs Signed-off-by: Nell Shamrell --- src/ci/azure-pipelines/try.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/ci/azure-pipelines/try.yml b/src/ci/azure-pipelines/try.yml index 90aa2620f6433..35246c05fb98c 100644 --- a/src/ci/azure-pipelines/try.yml +++ b/src/ci/azure-pipelines/try.yml @@ -6,14 +6,14 @@ variables: - group: prod-credentials jobs: -- job: Linux - timeoutInMinutes: 600 - pool: - vmImage: ubuntu-16.04 - steps: - - template: steps/run.yml - strategy: - matrix: +#- job: Linux +# timeoutInMinutes: 600 +# pool: +# vmImage: ubuntu-16.04 +# steps: +# - template: steps/run.yml +# strategy: +# matrix: # Round 1 # x86_64-gnu-llvm-7: # RUST_BACKTRACE: 1 From d8fe6485d983c62ca66f4e72004be71bfe2dcb9d Mon Sep 17 00:00:00 2001 From: Nell Shamrell Date: Mon, 16 Mar 2020 13:57:43 -0700 Subject: [PATCH 07/23] run ci on next set of windows builders Signed-off-by: Nell Shamrell --- src/ci/azure-pipelines/try.yml | 126 ++++++++++++++++----------------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/src/ci/azure-pipelines/try.yml b/src/ci/azure-pipelines/try.yml index 35246c05fb98c..48452c81ec332 100644 --- a/src/ci/azure-pipelines/try.yml +++ b/src/ci/azure-pipelines/try.yml @@ -57,45 +57,45 @@ jobs: # x86_64-gnu-distcheck: {} # mingw-check: {} # -- job: macOS - timeoutInMinutes: 600 - pool: - vmImage: macos-10.15 - steps: - - template: steps/run.yml - strategy: - matrix: +#- job: macOS +# timeoutInMinutes: 600 +# pool: +# vmImage: macos-10.15 +# steps: +# - template: steps/run.yml +# strategy: +# matrix: # OSX builders running tests, these run the full test suite. # NO_DEBUG_ASSERTIONS=1 to make them go faster, but also do have some # runners that run `//ignore-debug` tests. # # Note that the compiler is compiled to target 10.8 here because the Xcode # version that we're using, 8.2, cannot compile LLVM for OSX 10.7. - x86_64-apple: - SCRIPT: ./x.py test - INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --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 +# x86_64-apple: +# SCRIPT: ./x.py test +# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --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-x86_64-apple: - SCRIPT: ./x.py dist - INITIAL_RUST_CONFIGURE_ARGS: --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc - 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: +# SCRIPT: ./x.py dist +# INITIAL_RUST_CONFIGURE_ARGS: --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc +# 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-alt: - SCRIPT: ./x.py dist - INITIAL_RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --set rust.jemalloc - RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 - MACOSX_DEPLOYMENT_TARGET: 10.7 - NO_LLVM_ASSERTIONS: 1 - NO_DEBUG_ASSERTIONS: 1 +# dist-x86_64-apple-alt: +# SCRIPT: ./x.py dist +# INITIAL_RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --set rust.jemalloc +# RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 +# MACOSX_DEPLOYMENT_TARGET: 10.7 +# NO_LLVM_ASSERTIONS: 1 +# NO_DEBUG_ASSERTIONS: 1 - job: Windows @@ -116,33 +116,33 @@ jobs: # x86_64-msvc-2: # INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler # SCRIPT: make ci-subset-2 - i686-msvc-1: - INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc - SCRIPT: make ci-subset-1 +# i686-msvc-1: +# INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc +# SCRIPT: make ci-subset-1 # FIXME(#59637) - NO_DEBUG_ASSERTIONS: 1 - NO_LLVM_ASSERTIONS: 1 - i686-msvc-2: - INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc - SCRIPT: make ci-subset-2 +# NO_DEBUG_ASSERTIONS: 1 +# NO_LLVM_ASSERTIONS: 1 +# i686-msvc-2: +# INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc +# SCRIPT: make ci-subset-2 # FIXME(#59637) - NO_DEBUG_ASSERTIONS: 1 - NO_LLVM_ASSERTIONS: 1 - # MSVC aux tests -# x86_64-msvc-aux: -# RUST_CHECK_TARGET: check-aux EXCLUDE_CARGO=1 -# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc -# x86_64-msvc-cargo: -# SCRIPT: python x.py test src/tools/cargotest src/tools/cargo -# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc -# VCVARS_BAT: vcvars64.bat - # FIXME(#59637) # NO_DEBUG_ASSERTIONS: 1 # NO_LLVM_ASSERTIONS: 1 + # MSVC aux tests + x86_64-msvc-aux: + RUST_CHECK_TARGET: check-aux EXCLUDE_CARGO=1 + INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc + x86_64-msvc-cargo: + SCRIPT: python x.py test src/tools/cargotest src/tools/cargo + INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc + VCVARS_BAT: vcvars64.bat + # FIXME(#59637) + NO_DEBUG_ASSERTIONS: 1 + NO_LLVM_ASSERTIONS: 1 # MSVC tools tests -# x86_64-msvc-tools: -# SCRIPT: src/ci/docker/x86_64-gnu-tools/checktools.sh x.py -# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstate/toolstates.json + x86_64-msvc-tools: + SCRIPT: src/ci/docker/x86_64-gnu-tools/checktools.sh x.py + INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstate/toolstates.json # 32/64-bit MinGW builds. # @@ -157,17 +157,17 @@ jobs: # bucket, but they cleraly didn't originate there! The downloads originally # came from the mingw-w64 SourceForge download site. Unfortunately # SourceForge is notoriously flaky, so we mirror it on our own infrastructure. -# i686-mingw-1: -# INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu -# SCRIPT: make ci-mingw-subset-1 -# CUSTOM_MINGW: 1 + i686-mingw-1: + INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu + SCRIPT: make ci-mingw-subset-1 + CUSTOM_MINGW: 1 # FIXME(#59637) -# NO_DEBUG_ASSERTIONS: 1 -# NO_LLVM_ASSERTIONS: 1 -# i686-mingw-2: -# INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu -# SCRIPT: make ci-mingw-subset-2 -# CUSTOM_MINGW: 1 + NO_DEBUG_ASSERTIONS: 1 + NO_LLVM_ASSERTIONS: 1 + i686-mingw-2: + INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu + SCRIPT: make ci-mingw-subset-2 + CUSTOM_MINGW: 1 # x86_64-mingw-1: # SCRIPT: make ci-mingw-subset-1 # INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu From 6ea349611d1fcac1b64a95598debb179d47bfb65 Mon Sep 17 00:00:00 2001 From: Nell Shamrell Date: Tue, 17 Mar 2020 09:58:42 -0700 Subject: [PATCH 08/23] run different windows builds Signed-off-by: Nell Shamrell --- src/ci/azure-pipelines/try.yml | 96 +++++++++++++++++----------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/src/ci/azure-pipelines/try.yml b/src/ci/azure-pipelines/try.yml index 48452c81ec332..3848de28de347 100644 --- a/src/ci/azure-pipelines/try.yml +++ b/src/ci/azure-pipelines/try.yml @@ -129,20 +129,20 @@ jobs: # NO_DEBUG_ASSERTIONS: 1 # NO_LLVM_ASSERTIONS: 1 # MSVC aux tests - x86_64-msvc-aux: - RUST_CHECK_TARGET: check-aux EXCLUDE_CARGO=1 - INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc - x86_64-msvc-cargo: - SCRIPT: python x.py test src/tools/cargotest src/tools/cargo - INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc - VCVARS_BAT: vcvars64.bat +# x86_64-msvc-aux: +# RUST_CHECK_TARGET: check-aux EXCLUDE_CARGO=1 +# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc +# x86_64-msvc-cargo: +# SCRIPT: python x.py test src/tools/cargotest src/tools/cargo +# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc +# VCVARS_BAT: vcvars64.bat # FIXME(#59637) - NO_DEBUG_ASSERTIONS: 1 - NO_LLVM_ASSERTIONS: 1 +# NO_DEBUG_ASSERTIONS: 1 +# NO_LLVM_ASSERTIONS: 1 # MSVC tools tests - x86_64-msvc-tools: - SCRIPT: src/ci/docker/x86_64-gnu-tools/checktools.sh x.py - INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstate/toolstates.json +# x86_64-msvc-tools: +# SCRIPT: src/ci/docker/x86_64-gnu-tools/checktools.sh x.py +# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstate/toolstates.json # 32/64-bit MinGW builds. # @@ -157,51 +157,51 @@ jobs: # bucket, but they cleraly didn't originate there! The downloads originally # came from the mingw-w64 SourceForge download site. Unfortunately # SourceForge is notoriously flaky, so we mirror it on our own infrastructure. - i686-mingw-1: - INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu - SCRIPT: make ci-mingw-subset-1 - CUSTOM_MINGW: 1 - # FIXME(#59637) - NO_DEBUG_ASSERTIONS: 1 - NO_LLVM_ASSERTIONS: 1 - i686-mingw-2: - INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu - SCRIPT: make ci-mingw-subset-2 - CUSTOM_MINGW: 1 -# x86_64-mingw-1: +# i686-mingw-1: +# INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu # SCRIPT: make ci-mingw-subset-1 -# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu # CUSTOM_MINGW: 1 # FIXME(#59637) # NO_DEBUG_ASSERTIONS: 1 # NO_LLVM_ASSERTIONS: 1 -# x86_64-mingw-2: +# i686-mingw-2: +# INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu # SCRIPT: make ci-mingw-subset-2 -# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu # CUSTOM_MINGW: 1 + x86_64-mingw-1: + SCRIPT: make ci-mingw-subset-1 + INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu + CUSTOM_MINGW: 1 + # FIXME(#59637) + NO_DEBUG_ASSERTIONS: 1 + NO_LLVM_ASSERTIONS: 1 + x86_64-mingw-2: + SCRIPT: make ci-mingw-subset-2 + INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu + CUSTOM_MINGW: 1 # 32/64 bit MSVC and GNU deployment -# dist-x86_64-msvc: -# INITIAL_RUST_CONFIGURE_ARGS: >- -# --build=x86_64-pc-windows-msvc -# --target=x86_64-pc-windows-msvc,aarch64-pc-windows-msvc -# --enable-full-tools -# --enable-profiler -# SCRIPT: python x.py dist -# DIST_REQUIRE_ALL_TOOLS: 1 -# dist-i686-msvc: -# INITIAL_RUST_CONFIGURE_ARGS: >- -# --build=i686-pc-windows-msvc -# --target=i586-pc-windows-msvc -# --enable-full-tools -# --enable-profiler -# SCRIPT: python x.py dist -# DIST_REQUIRE_ALL_TOOLS: 1 -# dist-i686-mingw: -# INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-full-tools --enable-profiler -# SCRIPT: python x.py dist -# CUSTOM_MINGW: 1 -# DIST_REQUIRE_ALL_TOOLS: 1 + dist-x86_64-msvc: + INITIAL_RUST_CONFIGURE_ARGS: >- + --build=x86_64-pc-windows-msvc + --target=x86_64-pc-windows-msvc,aarch64-pc-windows-msvc + --enable-full-tools + --enable-profiler + SCRIPT: python x.py dist + DIST_REQUIRE_ALL_TOOLS: 1 + dist-i686-msvc: + INITIAL_RUST_CONFIGURE_ARGS: >- + --build=i686-pc-windows-msvc + --target=i586-pc-windows-msvc + --enable-full-tools + --enable-profiler + SCRIPT: python x.py dist + DIST_REQUIRE_ALL_TOOLS: 1 + dist-i686-mingw: + INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-full-tools --enable-profiler + SCRIPT: python x.py dist + CUSTOM_MINGW: 1 + DIST_REQUIRE_ALL_TOOLS: 1 # dist-x86_64-mingw: # SCRIPT: python x.py dist # INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler From a17458f2d3f19bc4329edbe2d15954efacda84ee Mon Sep 17 00:00:00 2001 From: Nell Shamrell Date: Tue, 17 Mar 2020 14:11:11 -0700 Subject: [PATCH 09/23] test last two Windows builds Signed-off-by: Nell Shamrell --- src/ci/azure-pipelines/try.yml | 74 +++++++++++++++++----------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/src/ci/azure-pipelines/try.yml b/src/ci/azure-pipelines/try.yml index 3848de28de347..f9be69c387b98 100644 --- a/src/ci/azure-pipelines/try.yml +++ b/src/ci/azure-pipelines/try.yml @@ -168,51 +168,51 @@ jobs: # INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu # SCRIPT: make ci-mingw-subset-2 # CUSTOM_MINGW: 1 - x86_64-mingw-1: - SCRIPT: make ci-mingw-subset-1 - INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu - CUSTOM_MINGW: 1 +# x86_64-mingw-1: +# SCRIPT: make ci-mingw-subset-1 +# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu +# CUSTOM_MINGW: 1 # FIXME(#59637) - NO_DEBUG_ASSERTIONS: 1 - NO_LLVM_ASSERTIONS: 1 - x86_64-mingw-2: - SCRIPT: make ci-mingw-subset-2 - INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu - CUSTOM_MINGW: 1 +# NO_DEBUG_ASSERTIONS: 1 +# NO_LLVM_ASSERTIONS: 1 +# x86_64-mingw-2: +# SCRIPT: make ci-mingw-subset-2 +# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu +# CUSTOM_MINGW: 1 # 32/64 bit MSVC and GNU deployment - dist-x86_64-msvc: - INITIAL_RUST_CONFIGURE_ARGS: >- - --build=x86_64-pc-windows-msvc - --target=x86_64-pc-windows-msvc,aarch64-pc-windows-msvc - --enable-full-tools - --enable-profiler - SCRIPT: python x.py dist - DIST_REQUIRE_ALL_TOOLS: 1 - dist-i686-msvc: - INITIAL_RUST_CONFIGURE_ARGS: >- - --build=i686-pc-windows-msvc - --target=i586-pc-windows-msvc - --enable-full-tools - --enable-profiler - SCRIPT: python x.py dist - DIST_REQUIRE_ALL_TOOLS: 1 - dist-i686-mingw: - INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-full-tools --enable-profiler - SCRIPT: python x.py dist - CUSTOM_MINGW: 1 - DIST_REQUIRE_ALL_TOOLS: 1 -# dist-x86_64-mingw: +# dist-x86_64-msvc: +# INITIAL_RUST_CONFIGURE_ARGS: >- +# --build=x86_64-pc-windows-msvc +# --target=x86_64-pc-windows-msvc,aarch64-pc-windows-msvc +# --enable-full-tools +# --enable-profiler +# SCRIPT: python x.py dist +# DIST_REQUIRE_ALL_TOOLS: 1 +# dist-i686-msvc: +# INITIAL_RUST_CONFIGURE_ARGS: >- +# --build=i686-pc-windows-msvc +# --target=i586-pc-windows-msvc +# --enable-full-tools +# --enable-profiler +# SCRIPT: python x.py dist +# DIST_REQUIRE_ALL_TOOLS: 1 +# dist-i686-mingw: +# INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-full-tools --enable-profiler # SCRIPT: python x.py dist -# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler # CUSTOM_MINGW: 1 # DIST_REQUIRE_ALL_TOOLS: 1 + dist-x86_64-mingw: + SCRIPT: python x.py dist + INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler + CUSTOM_MINGW: 1 + DIST_REQUIRE_ALL_TOOLS: 1 # "alternate" deployment, see .travis.yml for more info -# dist-x86_64-msvc-alt: -# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler -# SCRIPT: python x.py dist -# + dist-x86_64-msvc-alt: + INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler + SCRIPT: python x.py dist + # The macOS and Windows builds here are currently disabled due to them not being # overly necessary on `try` builds. We also don't actually have anything that # consumes the artifacts currently. Perhaps one day we can re-enable, but for now From 6175432b2a0b484d8275f5375b3b6d04a685a622 Mon Sep 17 00:00:00 2001 From: Nell Shamrell Date: Wed, 18 Mar 2020 08:14:44 -0700 Subject: [PATCH 10/23] run macos builds Signed-off-by: Nell Shamrell --- src/ci/azure-pipelines/try.yml | 94 +++++++++++++++++----------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/src/ci/azure-pipelines/try.yml b/src/ci/azure-pipelines/try.yml index f9be69c387b98..53e02f829ae03 100644 --- a/src/ci/azure-pipelines/try.yml +++ b/src/ci/azure-pipelines/try.yml @@ -57,55 +57,55 @@ jobs: # x86_64-gnu-distcheck: {} # mingw-check: {} # -#- job: macOS -# timeoutInMinutes: 600 -# pool: -# vmImage: macos-10.15 -# steps: -# - template: steps/run.yml -# strategy: -# matrix: +- job: macOS + timeoutInMinutes: 600 + pool: + vmImage: macos-10.15 + steps: + - template: steps/run.yml + strategy: + matrix: # OSX builders running tests, these run the full test suite. # NO_DEBUG_ASSERTIONS=1 to make them go faster, but also do have some # runners that run `//ignore-debug` tests. # # Note that the compiler is compiled to target 10.8 here because the Xcode # version that we're using, 8.2, cannot compile LLVM for OSX 10.7. -# x86_64-apple: -# SCRIPT: ./x.py test -# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --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 + x86_64-apple: + SCRIPT: ./x.py test + INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --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-x86_64-apple: -# SCRIPT: ./x.py dist -# INITIAL_RUST_CONFIGURE_ARGS: --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc -# 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: + SCRIPT: ./x.py dist + INITIAL_RUST_CONFIGURE_ARGS: --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc + 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-alt: -# SCRIPT: ./x.py dist -# INITIAL_RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --set rust.jemalloc -# RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 -# MACOSX_DEPLOYMENT_TARGET: 10.7 -# NO_LLVM_ASSERTIONS: 1 -# NO_DEBUG_ASSERTIONS: 1 + dist-x86_64-apple-alt: + SCRIPT: ./x.py dist + INITIAL_RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --set rust.jemalloc + RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 + MACOSX_DEPLOYMENT_TARGET: 10.7 + NO_LLVM_ASSERTIONS: 1 + NO_DEBUG_ASSERTIONS: 1 -- job: Windows - timeoutInMinutes: 600 - pool: - vmImage: 'vs2017-win2016' - steps: - - template: steps/run.yml - strategy: - matrix: +#- job: Windows +# timeoutInMinutes: 600 +# pool: +# vmImage: 'vs2017-win2016' +# steps: +# - template: steps/run.yml +# strategy: +# matrix: # 32/64 bit MSVC tests # x86_64-msvc-1: # INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler @@ -202,16 +202,16 @@ jobs: # SCRIPT: python x.py dist # CUSTOM_MINGW: 1 # DIST_REQUIRE_ALL_TOOLS: 1 - dist-x86_64-mingw: - SCRIPT: python x.py dist - INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler - CUSTOM_MINGW: 1 - DIST_REQUIRE_ALL_TOOLS: 1 +# dist-x86_64-mingw: +# SCRIPT: python x.py dist +# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler +# CUSTOM_MINGW: 1 +# DIST_REQUIRE_ALL_TOOLS: 1 # "alternate" deployment, see .travis.yml for more info - dist-x86_64-msvc-alt: - INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler - SCRIPT: python x.py dist +# dist-x86_64-msvc-alt: +# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler +# SCRIPT: python x.py dist # The macOS and Windows builds here are currently disabled due to them not being # overly necessary on `try` builds. We also don't actually have anything that From 861da5306e22fb4eeaf4c68cceb18c967eec2841 Mon Sep 17 00:00:00 2001 From: Nell Shamrell Date: Wed, 18 Mar 2020 10:58:46 -0700 Subject: [PATCH 11/23] trying fix for bash < 4 Signed-off-by: Nell Shamrell --- src/ci/scripts/setup-environment.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ci/scripts/setup-environment.sh b/src/ci/scripts/setup-environment.sh index 4f7641d50face..1b6757d4f5225 100755 --- a/src/ci/scripts/setup-environment.sh +++ b/src/ci/scripts/setup-environment.sh @@ -11,7 +11,8 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" # Since matrix variables are readonly in Azure Pipelines, we take # INITIAL_RUST_CONFIGURE_ARGS and establish RUST_CONFIGURE_ARGS # which downstream steps can alter -if [[ -v INITIAL_RUST_CONFIGURE_ARGS ]]; then +#if [[ -v INITIAL_RUST_CONFIGURE_ARGS ]]; then +if [[ -z ${INITIAL_RUST_CONFIGURE_ARGS} ]]; then ciCommandSetEnv RUST_CONFIGURE_ARGS "${INITIAL_RUST_CONFIGURE_ARGS}" fi From 01d2c954076c61dad16a0e8d9500c202845d966e Mon Sep 17 00:00:00 2001 From: Nell Shamrell Date: Wed, 18 Mar 2020 11:01:51 -0700 Subject: [PATCH 12/23] try again Signed-off-by: Nell Shamrell --- src/ci/scripts/setup-environment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ci/scripts/setup-environment.sh b/src/ci/scripts/setup-environment.sh index 1b6757d4f5225..8a80f6a38e38a 100755 --- a/src/ci/scripts/setup-environment.sh +++ b/src/ci/scripts/setup-environment.sh @@ -12,7 +12,7 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" # INITIAL_RUST_CONFIGURE_ARGS and establish RUST_CONFIGURE_ARGS # which downstream steps can alter #if [[ -v INITIAL_RUST_CONFIGURE_ARGS ]]; then -if [[ -z ${INITIAL_RUST_CONFIGURE_ARGS} ]]; then +if [[ -z "${INITIAL_RUST_CONFIGURE_ARGS}" ]]; then ciCommandSetEnv RUST_CONFIGURE_ARGS "${INITIAL_RUST_CONFIGURE_ARGS}" fi From 217ea150d4ad905e52421f7104a8ff4101fc2671 Mon Sep 17 00:00:00 2001 From: Nell Shamrell Date: Wed, 18 Mar 2020 11:06:59 -0700 Subject: [PATCH 13/23] check again Signed-off-by: Nell Shamrell --- src/ci/scripts/setup-environment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ci/scripts/setup-environment.sh b/src/ci/scripts/setup-environment.sh index 8a80f6a38e38a..4b2f30e8a616b 100755 --- a/src/ci/scripts/setup-environment.sh +++ b/src/ci/scripts/setup-environment.sh @@ -12,7 +12,7 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" # INITIAL_RUST_CONFIGURE_ARGS and establish RUST_CONFIGURE_ARGS # which downstream steps can alter #if [[ -v INITIAL_RUST_CONFIGURE_ARGS ]]; then -if [[ -z "${INITIAL_RUST_CONFIGURE_ARGS}" ]]; then +if [[ ${INITIAL_RUST_CONFIGURE_ARGS} ]]; then ciCommandSetEnv RUST_CONFIGURE_ARGS "${INITIAL_RUST_CONFIGURE_ARGS}" fi From 030349a75d4d385642da571acf91a5cfe2c2c4c7 Mon Sep 17 00:00:00 2001 From: Nell Shamrell Date: Wed, 18 Mar 2020 11:10:58 -0700 Subject: [PATCH 14/23] check again Signed-off-by: Nell Shamrell --- src/ci/scripts/setup-environment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ci/scripts/setup-environment.sh b/src/ci/scripts/setup-environment.sh index 4b2f30e8a616b..f6db5181667fe 100755 --- a/src/ci/scripts/setup-environment.sh +++ b/src/ci/scripts/setup-environment.sh @@ -12,7 +12,7 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" # INITIAL_RUST_CONFIGURE_ARGS and establish RUST_CONFIGURE_ARGS # which downstream steps can alter #if [[ -v INITIAL_RUST_CONFIGURE_ARGS ]]; then -if [[ ${INITIAL_RUST_CONFIGURE_ARGS} ]]; then +if [[ -z "$INITIAL_RUST_CONFIGURE_ARGS" ]]; then ciCommandSetEnv RUST_CONFIGURE_ARGS "${INITIAL_RUST_CONFIGURE_ARGS}" fi From c45591f11f981aab2352613190e070db315318b8 Mon Sep 17 00:00:00 2001 From: Nell Shamrell Date: Wed, 18 Mar 2020 11:16:28 -0700 Subject: [PATCH 15/23] check again Signed-off-by: Nell Shamrell --- src/ci/scripts/setup-environment.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ci/scripts/setup-environment.sh b/src/ci/scripts/setup-environment.sh index f6db5181667fe..2231145586fcd 100755 --- a/src/ci/scripts/setup-environment.sh +++ b/src/ci/scripts/setup-environment.sh @@ -12,7 +12,9 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" # INITIAL_RUST_CONFIGURE_ARGS and establish RUST_CONFIGURE_ARGS # which downstream steps can alter #if [[ -v INITIAL_RUST_CONFIGURE_ARGS ]]; then -if [[ -z "$INITIAL_RUST_CONFIGURE_ARGS" ]]; then + +#if [[ -z "$INITIAL_RUST_CONFIGURE_ARGS" ]]; then +if [[ -z "${INITIAL_RUST_CONFIGURE_ARGS}" ]]; then ciCommandSetEnv RUST_CONFIGURE_ARGS "${INITIAL_RUST_CONFIGURE_ARGS}" fi From 242f285897def6e1e3da562e24cdfcc0f9010496 Mon Sep 17 00:00:00 2001 From: Nell Shamrell Date: Wed, 18 Mar 2020 11:20:00 -0700 Subject: [PATCH 16/23] check again Signed-off-by: Nell Shamrell --- src/ci/scripts/setup-environment.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ci/scripts/setup-environment.sh b/src/ci/scripts/setup-environment.sh index 2231145586fcd..0cb6afd23b913 100755 --- a/src/ci/scripts/setup-environment.sh +++ b/src/ci/scripts/setup-environment.sh @@ -14,8 +14,10 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" #if [[ -v INITIAL_RUST_CONFIGURE_ARGS ]]; then #if [[ -z "$INITIAL_RUST_CONFIGURE_ARGS" ]]; then -if [[ -z "${INITIAL_RUST_CONFIGURE_ARGS}" ]]; then +if [[ -z "${INITIAL_RUST_CONFIGURE_ARGS+x}" ]]; then ciCommandSetEnv RUST_CONFIGURE_ARGS "${INITIAL_RUST_CONFIGURE_ARGS}" +else + echo "No initial Rust Configure Args set" fi # Builders starting with `dist-` are dist builders, but if they also end with From cf6b98f4238b99bfdd3f5c0ee895013d709819ed Mon Sep 17 00:00:00 2001 From: Nell Shamrell Date: Wed, 18 Mar 2020 11:29:49 -0700 Subject: [PATCH 17/23] check again Signed-off-by: Nell Shamrell --- src/ci/scripts/setup-environment.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ci/scripts/setup-environment.sh b/src/ci/scripts/setup-environment.sh index 0cb6afd23b913..9988aa2b08939 100755 --- a/src/ci/scripts/setup-environment.sh +++ b/src/ci/scripts/setup-environment.sh @@ -14,8 +14,9 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" #if [[ -v INITIAL_RUST_CONFIGURE_ARGS ]]; then #if [[ -z "$INITIAL_RUST_CONFIGURE_ARGS" ]]; then -if [[ -z "${INITIAL_RUST_CONFIGURE_ARGS+x}" ]]; then - ciCommandSetEnv RUST_CONFIGURE_ARGS "${INITIAL_RUST_CONFIGURE_ARGS}" +INITIAL_RUST_CONFIG=${INITIAL_RUST_CONFIGURE_ARGS} +if [ -z ${INITIAL_RUST_CONFIG}]; then + ciCommandSetEnv RUST_CONFIGURE_ARGS "${INITIAL_RUST_CONFIG}" else echo "No initial Rust Configure Args set" fi From 0f28c31fc72a03f61ee91e252f67a137f0c11d20 Mon Sep 17 00:00:00 2001 From: Nell Shamrell Date: Wed, 18 Mar 2020 11:36:28 -0700 Subject: [PATCH 18/23] trying something else Signed-off-by: Nell Shamrell --- src/ci/scripts/setup-environment.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/ci/scripts/setup-environment.sh b/src/ci/scripts/setup-environment.sh index 9988aa2b08939..9c7a5b14484f6 100755 --- a/src/ci/scripts/setup-environment.sh +++ b/src/ci/scripts/setup-environment.sh @@ -14,12 +14,18 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" #if [[ -v INITIAL_RUST_CONFIGURE_ARGS ]]; then #if [[ -z "$INITIAL_RUST_CONFIGURE_ARGS" ]]; then -INITIAL_RUST_CONFIG=${INITIAL_RUST_CONFIGURE_ARGS} -if [ -z ${INITIAL_RUST_CONFIG}]; then - ciCommandSetEnv RUST_CONFIGURE_ARGS "${INITIAL_RUST_CONFIG}" +#INITIAL_RUST_CONFIG=${INITIAL_RUST_CONFIGURE_ARGS} + +if [[ -z "${INITIAL_RUST_CONFIGURE_ARGS}"]] + INITIAL_RUST_CONFIG="" else - echo "No initial Rust Configure Args set" + INITIAL_RUST_CONFIG="${INITIAL_RUST_CONFIGURE_ARGS}" fi +#if [ -z ${INITIAL_RUST_CONFIG}]; then +# ciCommandSetEnv RUST_CONFIGURE_ARGS "${INITIAL_RUST_CONFIG}" +#else +# echo "No initial Rust Configure Args set" +#fi # Builders starting with `dist-` are dist builders, but if they also end with # `-alt` they are alternate dist builders. From 06d0f8d63e731984fe32ada22dfe3716b3acf646 Mon Sep 17 00:00:00 2001 From: Nell Shamrell Date: Wed, 18 Mar 2020 11:45:00 -0700 Subject: [PATCH 19/23] fix if else statement Signed-off-by: Nell Shamrell --- src/ci/scripts/setup-environment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ci/scripts/setup-environment.sh b/src/ci/scripts/setup-environment.sh index 9c7a5b14484f6..8dd473ffb2c98 100755 --- a/src/ci/scripts/setup-environment.sh +++ b/src/ci/scripts/setup-environment.sh @@ -16,7 +16,7 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" #if [[ -z "$INITIAL_RUST_CONFIGURE_ARGS" ]]; then #INITIAL_RUST_CONFIG=${INITIAL_RUST_CONFIGURE_ARGS} -if [[ -z "${INITIAL_RUST_CONFIGURE_ARGS}"]] +if [[ -z "${INITIAL_RUST_CONFIGURE_ARGS}"]]; then INITIAL_RUST_CONFIG="" else INITIAL_RUST_CONFIG="${INITIAL_RUST_CONFIGURE_ARGS}" From 8bc9555391d266090a2b126dab7e3cf435d25747 Mon Sep 17 00:00:00 2001 From: Nell Shamrell Date: Wed, 18 Mar 2020 11:50:59 -0700 Subject: [PATCH 20/23] testing again Signed-off-by: Nell Shamrell --- src/ci/scripts/setup-environment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ci/scripts/setup-environment.sh b/src/ci/scripts/setup-environment.sh index 8dd473ffb2c98..de71ea2cdf656 100755 --- a/src/ci/scripts/setup-environment.sh +++ b/src/ci/scripts/setup-environment.sh @@ -16,7 +16,7 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" #if [[ -z "$INITIAL_RUST_CONFIGURE_ARGS" ]]; then #INITIAL_RUST_CONFIG=${INITIAL_RUST_CONFIGURE_ARGS} -if [[ -z "${INITIAL_RUST_CONFIGURE_ARGS}"]]; then +if [[ -z "${INITIAL_RUST_CONFIGURE_ARGS+x}" ]]; then INITIAL_RUST_CONFIG="" else INITIAL_RUST_CONFIG="${INITIAL_RUST_CONFIGURE_ARGS}" From c2e6aaa379cc12ec6db74d6f6c813a3948c8e3b1 Mon Sep 17 00:00:00 2001 From: Nell Shamrell Date: Wed, 18 Mar 2020 12:06:19 -0700 Subject: [PATCH 21/23] trying a full solution Signed-off-by: Nell Shamrell --- src/ci/scripts/setup-environment.sh | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/ci/scripts/setup-environment.sh b/src/ci/scripts/setup-environment.sh index de71ea2cdf656..20341bbe06a3d 100755 --- a/src/ci/scripts/setup-environment.sh +++ b/src/ci/scripts/setup-environment.sh @@ -11,21 +11,15 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" # Since matrix variables are readonly in Azure Pipelines, we take # INITIAL_RUST_CONFIGURE_ARGS and establish RUST_CONFIGURE_ARGS # which downstream steps can alter -#if [[ -v INITIAL_RUST_CONFIGURE_ARGS ]]; then - -#if [[ -z "$INITIAL_RUST_CONFIGURE_ARGS" ]]; then -#INITIAL_RUST_CONFIG=${INITIAL_RUST_CONFIGURE_ARGS} - +# MacOS ships with Bash 3.16, which means we cannot use +# if [[ -v FOO ]], as that was introduced in Bash 4.2 if [[ -z "${INITIAL_RUST_CONFIGURE_ARGS+x}" ]]; then INITIAL_RUST_CONFIG="" + echo "No initial Rust Configure Args set" else INITIAL_RUST_CONFIG="${INITIAL_RUST_CONFIGURE_ARGS}" + ciCommandSetEnv RUST_CONFIGURE_ARGS "${INITIAL_RUST_CONFIG}" fi -#if [ -z ${INITIAL_RUST_CONFIG}]; then -# ciCommandSetEnv RUST_CONFIGURE_ARGS "${INITIAL_RUST_CONFIG}" -#else -# echo "No initial Rust Configure Args set" -#fi # Builders starting with `dist-` are dist builders, but if they also end with # `-alt` they are alternate dist builders. From 03dce3bbcad7806eaebaff9deabdf8c2556c6fa4 Mon Sep 17 00:00:00 2001 From: Nell Shamrell Date: Wed, 18 Mar 2020 12:09:56 -0700 Subject: [PATCH 22/23] add a couple of windows tests to try yml Signed-off-by: Nell Shamrell --- src/ci/azure-pipelines/try.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/ci/azure-pipelines/try.yml b/src/ci/azure-pipelines/try.yml index 53e02f829ae03..d76aa0ce199a4 100644 --- a/src/ci/azure-pipelines/try.yml +++ b/src/ci/azure-pipelines/try.yml @@ -98,24 +98,24 @@ jobs: NO_DEBUG_ASSERTIONS: 1 -#- job: Windows -# timeoutInMinutes: 600 -# pool: -# vmImage: 'vs2017-win2016' -# steps: -# - template: steps/run.yml -# strategy: -# matrix: +- job: Windows + timeoutInMinutes: 600 + pool: + vmImage: 'vs2017-win2016' + steps: + - template: steps/run.yml + strategy: + matrix: # 32/64 bit MSVC tests -# x86_64-msvc-1: -# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler -# SCRIPT: make ci-subset-1 -# # FIXME(#59637) -# NO_DEBUG_ASSERTIONS: 1 -# NO_LLVM_ASSERTIONS: 1 -# x86_64-msvc-2: -# INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler -# SCRIPT: make ci-subset-2 + x86_64-msvc-1: + INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler + SCRIPT: make ci-subset-1 + # FIXME(#59637) + NO_DEBUG_ASSERTIONS: 1 + NO_LLVM_ASSERTIONS: 1 + x86_64-msvc-2: + INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler + SCRIPT: make ci-subset-2 # i686-msvc-1: # INITIAL_RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc # SCRIPT: make ci-subset-1 From 4ed95b179a86b34d9b231315f99a0517bf4f9ec0 Mon Sep 17 00:00:00 2001 From: Nell Shamrell Date: Wed, 18 Mar 2020 16:14:06 -0700 Subject: [PATCH 23/23] correct trailing whitespace Signed-off-by: Nell Shamrell --- src/ci/scripts/setup-environment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ci/scripts/setup-environment.sh b/src/ci/scripts/setup-environment.sh index 20341bbe06a3d..9a493209e3c12 100755 --- a/src/ci/scripts/setup-environment.sh +++ b/src/ci/scripts/setup-environment.sh @@ -11,7 +11,7 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" # Since matrix variables are readonly in Azure Pipelines, we take # INITIAL_RUST_CONFIGURE_ARGS and establish RUST_CONFIGURE_ARGS # which downstream steps can alter -# MacOS ships with Bash 3.16, which means we cannot use +# MacOS ships with Bash 3.16, which means we cannot use # if [[ -v FOO ]], as that was introduced in Bash 4.2 if [[ -z "${INITIAL_RUST_CONFIGURE_ARGS+x}" ]]; then INITIAL_RUST_CONFIG=""