File tree Expand file tree Collapse file tree 3 files changed +20
-5
lines changed Expand file tree Collapse file tree 3 files changed +20
-5
lines changed Original file line number Diff line number Diff line change 1
1
steps :
2
- - bash : git config --replace-all --global core.autocrlf false
3
- displayName : " Disable git automatic line ending conversion (on C:/)"
4
-
5
2
# Download and install MSYS2, needed primarily for the test suite (run-make) but
6
3
# also used by the MinGW toolchain for assembling things.
7
4
#
Original file line number Diff line number Diff line change @@ -87,6 +87,10 @@ steps:
87
87
displayName : Ensure the build happens on C:\ instead of D:\
88
88
condition : and(succeeded(), not(variables.SKIP_JOB))
89
89
90
+ - bash : src/ci/scripts/disable-git-crlf-conversion.sh
91
+ displayName : " Disable git automatic line ending conversion (on C:/)"
92
+ condition : and(succeeded(), not(variables.SKIP_JOB))
93
+
90
94
- template : install-windows-build-deps.yml
91
95
92
96
# Looks like docker containers have IPv6 disabled by default, so let's turn it
@@ -104,8 +108,9 @@ steps:
104
108
# re-enables autocrlf. We've not tracked down the exact cause -- and there may
105
109
# be multiple -- but this should ensure submodules are checked out with the
106
110
# appropriate line endings.
107
- - bash : git config --replace-all --global core.autocrlf false
108
- displayName : " Disable git automatic line ending conversion"
111
+ - bash : src/ci/scripts/disable-git-crlf-conversion.sh
112
+ displayName : Disable git automatic line ending conversion
113
+ condition : and(succeeded(), not(variables.SKIP_JOB))
109
114
110
115
# Check out all our submodules, but more quickly than using git by using one of
111
116
# our custom scripts
Original file line number Diff line number Diff line change
1
+ #! /bin/bash
2
+ # Disable automatic line ending conversion, which is enabled by default on
3
+ # Azure's Windows image. Having the conversion enabled caused regressions both
4
+ # in our test suite (it broke miri tests) and in the ecosystem, since we
5
+ # started shipping install scripts with CRLF endings instead of the old LF.
6
+ #
7
+ # Note that we do this a couple times during the build as the PATH and current
8
+ # user/directory change, e.g. when mingw is enabled.
9
+
10
+ set -euo pipefail
11
+ IFS=$' \n\t '
12
+
13
+ git config --replace-all --global core.autocrlf false
You can’t perform that action at this time.
0 commit comments