File tree Expand file tree Collapse file tree 1 file changed +5
-8
lines changed Expand file tree Collapse file tree 1 file changed +5
-8
lines changed Original file line number Diff line number Diff line change @@ -190,14 +190,6 @@ jobs:
190190 if : ${{ !matrix.codebuild }}
191191 run : src/ci/scripts/enable-docker-ipv6.sh
192192
193- # Disable automatic line ending conversion (again). On Windows, when we're
194- # installing dependencies, something switches the git configuration directory or
195- # re-enables autocrlf. We've not tracked down the exact cause -- and there may
196- # be multiple -- but this should ensure submodules are checked out with the
197- # appropriate line endings.
198- - name : disable git crlf conversion
199- run : src/ci/scripts/disable-git-crlf-conversion.sh
200-
201193 - name : ensure line endings are correct
202194 run : src/ci/scripts/verify-line-endings.sh
203195
@@ -219,6 +211,11 @@ jobs:
219211 cd src/ci/citool
220212 CARGO_INCREMENTAL=0 CARGO_TARGET_DIR=../../../build/citool cargo build
221213
214+ # Check that autocrlf (disabled earlier) is still disabled.
215+ # If so then assume it was enabled during submodule checkout too.
216+ - name : check crlf disabled
217+ run : git config --global core.autocrlf | grep false || exit 1
218+
222219 - name : run the build
223220 run : |
224221 set +e
You can’t perform that action at this time.
0 commit comments