Skip to content

Commit d38d160

Browse files
committed
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
2 parents 0b680cf + 9adefc0 commit d38d160

File tree

2 files changed

+38
-3
lines changed

2 files changed

+38
-3
lines changed

.azure-pipelines/steps/run.yml

+9
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,15 @@ steps:
8484
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
8585
displayName: Check out submodules (Windows)
8686

87+
# See also the disable for autocrlf above, this just checks that it worked
88+
#
89+
# If matches for '\r' are found, we should immediately exit the build.
90+
- bash: |
91+
set -x
92+
git config --list
93+
(egrep -l $'\r'\$ src/tools/rust-installer/install-template.sh && exit 1) || true
94+
displayName: Verify line endings are LF
95+
8796
# Ensure the `aws` CLI is installed so we can deploy later on, cache docker
8897
# images, etc.
8998
- bash: |

.azure-pipelines/try.yml

+29-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,35 @@ jobs:
1818
IMAGE: dist-x86_64-linux
1919
DEPLOY: 1
2020

21-
dist-x86_64-linux-alt:
22-
IMAGE: dist-x86_64-linux
23-
DEPLOY_ALT: 1
21+
# dist-x86_64-linux-alt:
22+
# IMAGE: dist-x86_64-linux
23+
# DEPLOY_ALT: 1
24+
- job: Windows
25+
timeoutInMinutes: 600
26+
pool:
27+
vmImage: 'vs2017-win2016'
28+
steps:
29+
- template: steps/run.yml
30+
strategy:
31+
matrix:
32+
dist-i686-msvc:
33+
RUST_CONFIGURE_ARGS: >
34+
--build=i686-pc-windows-msvc
35+
--target=i586-pc-windows-msvc
36+
--enable-full-tools
37+
--enable-profiler
38+
SCRIPT: python x.py dist
39+
DIST_REQUIRE_ALL_TOOLS: 1
40+
DEPLOY: 1
41+
dist-i686-mingw:
42+
MSYS_BITS: 32
43+
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-full-tools --enable-profiler
44+
SCRIPT: python x.py dist
45+
MINGW_URL: https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror
46+
MINGW_ARCHIVE: i686-6.3.0-release-posix-dwarf-rt_v5-rev2.7z
47+
MINGW_DIR: mingw32
48+
DIST_REQUIRE_ALL_TOOLS: 1
49+
DEPLOY: 1
2450

2551
# The macOS and Windows builds here are currently disabled due to them not being
2652
# overly necessary on `try` builds. We also don't actually have anything that

0 commit comments

Comments
 (0)