Skip to content

git: skip Rust bits in i686 builds#207

Merged
dscho merged 1 commit into
mainfrom
disable-rust-in-i686-git
Jul 2, 2026
Merged

git: skip Rust bits in i686 builds#207
dscho merged 1 commit into
mainfrom
disable-rust-in-i686-git

Conversation

@dscho

@dscho dscho commented Jun 30, 2026

Copy link
Copy Markdown
Member

Git for Windows builds the mingw-w64-git package with NO_RUST by default. But MSYS2 doesn't, hence the need for this change.

With this PR, the mingw-w64-git/ directory is treesame between msys2 and git-for-windows once again.

There is no i686 Rust we could use, therefore we have to exclude the
Rust bits from the build.

One of the next Git versions will make the Rust bits mandatory, at which
point we will have to stop building mingw-w64-i686-git.

To accommodate the i686 variants of MinGit, which still need to be
supported until 2029 (see https://gitforwindows.org/32-bit), that will
be the time when we have to branch off a `mingw-w64-git-legacy` package
that sticks to a Git version that _does_ allow for NO_RUST, and we will
have to switch the `git-sdk-32` to that package.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho dscho self-assigned this Jun 30, 2026
@dscho dscho merged commit 4ba9c84 into main Jul 2, 2026
3 checks passed
@dscho dscho deleted the disable-rust-in-i686-git branch July 2, 2026 11:40
dscho added a commit that referenced this pull request Jul 3, 2026
This was already done as part of b08d188 (mingw-w64-git: upgrade to
Git for Windows 2.55.0 (msys2#30227), 2026-06-29), but was inadvertently
reverted in the parent commit because I had forgotten to merge
#207 in the hectic
release process before building the artifacts of Git for Windows
v2.55.0(2).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
lazka pushed a commit to msys2/MINGW-packages that referenced this pull request Jul 3, 2026
* mingw-w64-git: upgrade to Git for Windows v2.55.0.windows.2

This commit was created by:
https://github.com/git-for-windows/git-for-windows-automation/actions/runs/28586498193

See https://github.com/git-for-windows/git/releases/tag/v2.55.0.windows.2 for details.

* git: skip Rust bits in i686 builds (again)

This was already done as part of b08d188 (mingw-w64-git: upgrade to
Git for Windows 2.55.0 (#30227), 2026-06-29), but was inadvertently
reverted in the parent commit because I had forgotten to merge
git-for-windows#207 in the hectic
release process before building the artifacts of Git for Windows
v2.55.0(2).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

---------

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
github-actions Bot pushed a commit to cygapiss/msys2-apiss that referenced this pull request Jul 3, 2026
…282)

* mingw-w64-git: upgrade to Git for Windows v2.55.0.windows.2

This commit was created by:
https://github.com/git-for-windows/git-for-windows-automation/actions/runs/28586498193

See https://github.com/git-for-windows/git/releases/tag/v2.55.0.windows.2 for details.

* git: skip Rust bits in i686 builds (again)

This was already done as part of b08d1887b8 (mingw-w64-git: upgrade to
Git for Windows 2.55.0 (#30227), 2026-06-29), but was inadvertently
reverted in the parent commit because I had forgotten to merge
git-for-windows/MINGW-packages#207 in the hectic
release process before building the artifacts of Git for Windows
v2.55.0(2).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

---------

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

Source: msys2/MINGW-packages@14d8584
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants