mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert back to Git-for-Windows for MinGW CI builds

Browse Source 
In https://github.com/rust-lang/rust/pull/121182 the mingw build was
changed to use MSYS2's version of Git. This commit reverts that, as
it was considered too slow.
This commit is contained in:
Matt Harding 2024-03-07 03:09:29 +00:00
parent e27c4722d3
commit c7a48a507a
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
INSTALL.md
View File

@ -145,6 +145,15 @@ toolchain.
1. Download the latest [MSYS2 installer][msys2] and go through the installer. 1. Download the latest [MSYS2 installer][msys2] and go through the installer.
2. Download and install [Git for Windows](https://git-scm.com/download/win).
Make sure that it's in your Windows PATH. To enable access to it from within
MSYS2, edit the relevant `mingw[32|64].ini` file in your MSYS2 installation
directory and uncomment the line `MSYS2_PATH_TYPE=inherit`.
You could install and use MSYS2's version of git instead with `pacman`,
however this is not recommended as it's excrutiatingly slow, and not frequently
tested for compatability.
2. Start a MINGW64 or MINGW32 shell (depending on whether you want 32-bit 2. Start a MINGW64 or MINGW32 shell (depending on whether you want 32-bit
or 64-bit Rust) either from your start menu, or by running `mingw64.exe` or 64-bit Rust) either from your start menu, or by running `mingw64.exe`
or `mingw32.exe` from your MSYS2 installation directory (e.g. `C:\msys64`). or `mingw32.exe` from your MSYS2 installation directory (e.g. `C:\msys64`).
@ -160,8 +169,7 @@ toolchain.
# Note that it is important that you do **not** use the 'python2', 'cmake', # Note that it is important that you do **not** use the 'python2', 'cmake',
# and 'ninja' packages from the 'msys2' subsystem. # and 'ninja' packages from the 'msys2' subsystem.
# The build has historically been known to fail with these packages. # The build has historically been known to fail with these packages.
pacman -S git \ pacman -S make \
make \
diffutils \ diffutils \
tar \ tar \
mingw-w64-x86_64-python \ mingw-w64-x86_64-python \
@ -176,11 +184,9 @@ toolchain.
python x.py setup dist && python x.py build && python x.py install python x.py setup dist && python x.py build && python x.py install
``` ```
If you want to use the native versions of Git, Python, or CMake you can remove If you want to try the native Windows versions of Python or CMake, you can remove
them from the above pacman command and install them from another source. Make them from the above pacman command and install them from another source. Follow
sure that they're in your Windows PATH, and edit the relevant `mingw[32|64].ini` the instructions in step 2 to get them on PATH.
file in your MSYS2 installation directory by uncommenting the line
`MSYS2_PATH_TYPE=inherit` to include them in your MSYS2 PATH.
Using Windows native Python can be helpful if you get errors when building LLVM. Using Windows native Python can be helpful if you get errors when building LLVM.
You may also want to use Git for Windows, as it is often *much* faster. Turning You may also want to use Git for Windows, as it is often *much* faster. Turning

14
src/ci/scripts/install-msys2.sh
View File

@ -31,12 +31,14 @@ if isWindows; then
# Delete these pre-installed tools so we can't accidentally use them, because we are using the # Delete these pre-installed tools so we can't accidentally use them, because we are using the
# MSYS2 setup action versions instead. # MSYS2 setup action versions instead.
# Delete pre-installed version of MSYS2 # Delete pre-installed version of MSYS2
echo "Cleaning up tools in PATH"
rm -r "/c/msys64/" rm -r "/c/msys64/"
# Delete Strawberry Perl, which contains a version of mingw # Delete Strawberry Perl, which contains a version of mingw
rm -r "/c/Strawberry/" rm -r "/c/Strawberry/"
# Delete these other copies of mingw, I don't even know where they come from. # Delete these other copies of mingw, I don't even know where they come from.
rm -r "/c/mingw64/" rm -r "/c/mingw64/"
rm -r "/c/mingw32/" rm -r "/c/mingw32/"
echo "Finished cleaning up tools in PATH"
if isKnownToBeMingwBuild; then if isKnownToBeMingwBuild; then
# Use the mingw version of CMake for mingw builds. # Use the mingw version of CMake for mingw builds.
@ -46,11 +48,11 @@ if isWindows; then
# Install mingw-w64-$arch-cmake # Install mingw-w64-$arch-cmake
pacboy -S --noconfirm cmake:p pacboy -S --noconfirm cmake:p
# We use Git-for-Windows for MSVC builds, and MSYS2 Git for mingw builds, # It would be nice to use MSYS's git in MinGW builds so that it's tested and known to
# so that both are tested. # work. But it makes everything extremely slow, so it's commented out for now.
# Delete Windows-Git # # Delete Windows-Git
rm -r "/c/Program Files/Git/" # rm -r "/c/Program Files/Git/"
# Install MSYS2 git # # Install MSYS2 git
pacman -S --noconfirm git # pacman -S --noconfirm git
fi fi
fi fi