Auto merge of #144001 - ChrisDenton:ci3, r=ChrisDenton

Disable disable git crlf conversion

See if skipping this step works around at least some of the CI issues.

I added a check to see if `core.autocrlf` is still set to `false`. The above steps disable it multiple times so one less *shouldn't* make a difference.

Author: bors

.github/workflows/ci.yml

@@ -190,14 +190,6 @@ jobs:
         if: ${{ !matrix.codebuild }}
         run: src/ci/scripts/enable-docker-ipv6.sh
 
-      # Disable automatic line ending conversion (again). On Windows, when we're
-      # installing dependencies, something switches the git configuration directory or
-      # re-enables autocrlf. We've not tracked down the exact cause -- and there may
-      # be multiple -- but this should ensure submodules are checked out with the
-      # appropriate line endings.
-      - name: disable git crlf conversion
-        run: src/ci/scripts/disable-git-crlf-conversion.sh
-
       - name: ensure line endings are correct
         run: src/ci/scripts/verify-line-endings.sh
 
@@ -219,6 +211,11 @@ jobs:
           cd src/ci/citool
           CARGO_INCREMENTAL=0 CARGO_TARGET_DIR=../../../build/citool cargo build
 
+      # Check that autocrlf (disabled earlier) is still disabled.
+      # If so then assume it was disabled during submodule checkout too.
+      - name: check crlf disabled
+        run: git config --global core.autocrlf | grep false || exit 1
+
       - name: run the build
         run: |
           set +e