diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2019-11-07 09:25:06 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2019-11-07 13:06:56 -0800 |
| commit | a7b0beac6da684a005c91ecc8f652989f9174887 (patch) | |
| tree | 9647132938e580bd6cd4689e69899f943ef8fe74 | |
| parent | 1e4c2ae622549108a55fcbdaeffdbf6d56ace3ac (diff) | |
| download | rust-a7b0beac6da684a005c91ecc8f652989f9174887.tar.gz rust-a7b0beac6da684a005c91ecc8f652989f9174887.zip | |
Attempt to fix *.yml confguration on Azure
Currently the `RUST_CONFIGURE_ARGS` variable apparently has a trailing newline at the end of it due to the way it's configured in yaml. This causes issues with MSVC's `install-clang.sh` step where the way the bash syntax works out means that we drop the arg we're trying to add and it doesn't actually get added! The hopeful fix here is to tweak how we specify the yaml syntax to not have a trailing newline, we'll see what CI says about this...
| -rw-r--r-- | src/ci/azure-pipelines/auto.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ci/azure-pipelines/auto.yml b/src/ci/azure-pipelines/auto.yml index 271c3258544..836f81a7816 100644 --- a/src/ci/azure-pipelines/auto.yml +++ b/src/ci/azure-pipelines/auto.yml @@ -318,7 +318,7 @@ jobs: # 32/64 bit MSVC and GNU deployment dist-x86_64-msvc: MSYS_BITS: 64 - RUST_CONFIGURE_ARGS: > + RUST_CONFIGURE_ARGS: >- --build=x86_64-pc-windows-msvc --target=x86_64-pc-windows-msvc,aarch64-pc-windows-msvc --enable-full-tools @@ -328,7 +328,7 @@ jobs: DEPLOY: 1 dist-i686-msvc: MSYS_BITS: 32 - RUST_CONFIGURE_ARGS: > + RUST_CONFIGURE_ARGS: >- --build=i686-pc-windows-msvc --target=i586-pc-windows-msvc --enable-full-tools |