]> git.lizzy.rs Git - rust.git/commitdiff
Attempt to fix *.yml confguration on Azure
authorAlex Crichton <alex@alexcrichton.com>
Thu, 7 Nov 2019 17:25:06 +0000 (09:25 -0800)
committerAlex Crichton <alex@alexcrichton.com>
Thu, 7 Nov 2019 21:06:56 +0000 (13:06 -0800)
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...

src/ci/azure-pipelines/auto.yml

index 271c32585449ec295495a2882fb480de246af258..836f81a7816569cb613f07ae56bcf867db738575 100644 (file)
@@ -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