Use windows git for MSVC

rust-lang · Feb 16, 2024 · b592418 · b592418
1 parent b7531a9
commit b592418
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -104,7 +104,7 @@ jobs:
           update: false
           release: true
           path-type: inherit
-          install: "make git dos2unix diffutils\n"
+          install: "make dos2unix diffutils\n"
       - name: disable git crlf conversion
         run: git config --global core.autocrlf false
       - name: checkout the source code
@@ -509,7 +509,7 @@ jobs:
           update: false
           release: true
           path-type: inherit
-          install: "make git dos2unix diffutils\n"
+          install: "make dos2unix diffutils\n"
       - name: disable git crlf conversion
         run: git config --global core.autocrlf false
       - name: checkout the source code
@@ -648,7 +648,7 @@ jobs:
           update: false
           release: true
           path-type: inherit
-          install: "make git dos2unix diffutils\n"
+          install: "make dos2unix diffutils\n"
       - name: disable git crlf conversion
         run: git config --global core.autocrlf false
       - name: checkout the source code

diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
@@ -134,7 +134,6 @@ x--expand-yaml-anchors--remove:
           path-type: inherit
           install: >
             make
-            git
             dos2unix
             diffutils
 

diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh
@@ -30,8 +30,6 @@ if isWindows; then
 
     # Delete these pre-installed tools so we can't accidentally use them, because we are using the
     # MSYS2 setup action versions instead.
-    # Delete Windows-Git
-    rm -r "/c/Program Files/Git/"
     # Delete pre-installed version of MSYS2
     rm -r "/c/msys64/"
     # Delete Strawberry Perl, which contains a version of mingw
@@ -41,9 +39,18 @@ if isWindows; then
     rm -r "/c/mingw32/"
 
     if isKnownToBeMingwBuild; then
+        # Use the mingw version of CMake for mingw builds.
+        # However, the MSVC build needs native CMake, as it fails with the mingw one.
         # Delete native CMake
         rm -r "/c/Program Files/CMake/"
         # Install mingw-w64-$arch-cmake
         pacboy -S --noconfirm cmake:p
-    fi # Otherwise, the MSVC build needs native CMake, it fails with the mingw one.
+
+        # We use Git-for-Windows for MSVC builds, and MSYS2 Git for mingw builds,
+        # so that both are tested.
+        # Delete Windows-Git
+        rm -r "/c/Program Files/Git/"
+        # Install MSYS2 git
+        pacman -S --noconfirm git
+    fi
 fi