@@ -126,33 +126,17 @@ steps:
126
126
displayName : Disable git automatic line ending conversion
127
127
condition : and(succeeded(), not(variables.SKIP_JOB))
128
128
129
- # Check out all our submodules, but more quickly than using git by using one of
130
- # our custom scripts
131
129
- bash : src/ci/scripts/checkout-submodules.sh
132
130
env :
133
131
AGENT_OS : $(Agent.OS)
134
132
displayName : Checkout submodules
135
133
condition : and(succeeded(), not(variables.SKIP_JOB))
136
134
137
- # See also the disable for autocrlf above, this just checks that it worked
138
- #
139
- # We check both in rust-lang/rust and in a submodule to make sure both are
140
- # accurate. Submodules are checked out significantly later than the main
141
- # repository in this script, so settings can (and do!) change between then.
142
- #
143
- # Linux (and maybe macOS) builders don't currently have dos2unix so just only
144
- # run this step on Windows.
145
- - bash : |
146
- set -x
147
- # print out the git configuration so we can better investigate failures in
148
- # the following
149
- git config --list --show-origin
150
- dos2unix -ih Cargo.lock src/tools/rust-installer/install-template.sh
151
- endings=$(dos2unix -ic Cargo.lock src/tools/rust-installer/install-template.sh)
152
- # if endings has non-zero length, error out
153
- if [ -n "$endings" ]; then exit 1 ; fi
154
- condition : and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
155
- displayName : Verify line endings are LF
135
+ - bash : src/ci/scripts/verify-line-endings.sh
136
+ env :
137
+ AGENT_OS : $(Agent.OS)
138
+ displayName : Verify line endings
139
+ condition : and(succeeded(), not(variables.SKIP_JOB))
156
140
157
141
# Ensure the `aws` CLI is installed so we can deploy later on, cache docker
158
142
# images, etc.
0 commit comments