Auto merge of #62545 - Mark-Simulacrum:azure-line-endings, r=<try>

Attempt to fix Azure line endings

This is just a verification step for now, but I want to run it in a try builder to gauge whether it works or not. Presumably it'll fail, and we can then attempt to track down why.

r? @ghost

Author: bors

.azure-pipelines/steps/run.yml

@@ -15,16 +15,26 @@ steps:
 - bash: git config --global core.autocrlf false
   displayName: "Disable git automatic line ending conversion"
 
+- bash: |
+    set -x
+    git config --list --show-origin
+  displayName: git config pre checkout
+
 - checkout: self
   fetchDepth: 2
 
+- bash: git config --list --show-origin
+  displayName: git config post checkout
+
 # Spawn a background process to collect CPU usage statistics which we'll upload
 # at the end of the build. See the comments in the script here for more
 # information.
 - bash: python src/ci/cpu-usage-over-time.py &> cpu-usage.csv &
   displayName: "Collect CPU-usage statistics in the background"
 
-- bash: printenv | sort
+- bash: |
+    printenv | sort
+    git config --list --show-origin
   displayName: Show environment variables
 
 - bash: |
@@ -84,6 +94,16 @@ steps:
   condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
   displayName: Check out submodules (Windows)
 
+# See also the disable for autocrlf above, this just checks that it worked
+#
+# If matches for '\r' are found, we should immediately exit the build.
+- bash: |
+    set -x
+    git config --list
+    bash -c 'egrep -q $"\r"\$ src/tools/rust-installer/install-template.sh'
+    if [ $? = 0 ]; then exit 1 ; fi
+  displayName: Verify line endings are LF
+
 # Ensure the `aws` CLI is installed so we can deploy later on, cache docker
 # images, etc.
 - bash: |

.azure-pipelines/try.yml

@@ -18,9 +18,35 @@ jobs:
         IMAGE: dist-x86_64-linux
         DEPLOY: 1
 
-      dist-x86_64-linux-alt:
-        IMAGE: dist-x86_64-linux
-        DEPLOY_ALT: 1
+        #      dist-x86_64-linux-alt:
+        #        IMAGE: dist-x86_64-linux
+        #        DEPLOY_ALT: 1
+- job: Windows
+  timeoutInMinutes: 600
+  pool:
+    vmImage: 'vs2017-win2016'
+  steps:
+  - template: steps/run.yml
+  strategy:
+    matrix:
+      dist-i686-msvc:
+        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
+        DEPLOY: 1
+      dist-i686-mingw:
+        MSYS_BITS: 32
+        RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-full-tools --enable-profiler
+        SCRIPT: python x.py dist
+        MINGW_URL: https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror
+        MINGW_ARCHIVE: i686-6.3.0-release-posix-dwarf-rt_v5-rev2.7z
+        MINGW_DIR: mingw32
+        DIST_REQUIRE_ALL_TOOLS: 1
+        DEPLOY: 1
 
 # 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