Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

msys2-runtime-3.3: some backports from msys2 runtime 3.4 #138

Merged

Conversation

dscho
Copy link
Member

@dscho dscho commented Nov 25, 2023

This corresponds to git-for-windows/msys2-runtime#61.

We're generating patches from the current branch, therefore we need to
determine the commit that started the most recent rebase from that
branch, too.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
We'll want to deploy only the i686 version, of course, where we're stuck
with GCC 10, but we will also want any CI builds targeting x86_64 to
pass...

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho dscho self-assigned this Nov 25, 2023
@dscho dscho changed the title msys2-runtime: some backports from msys2 runtime 3.4 msys2-runtime-3.3: some backports from msys2 runtime 3.4 Nov 25, 2023
We haven't updated the i686 variant of Git for Windows' MSYS2 runtime.
The recent "Bad address" fixes (in this commit, 0068 and 0069) seem to
be important to warrant a new package version, and while at it, backport
a couple of other relevant patches as well as build fixes for GCC >= 13.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho dscho force-pushed the some-backports-from-msys2-runtime-3.4 branch from 032da46 to d6ec478 Compare November 25, 2023 02:02
@dscho dscho marked this pull request as ready for review November 25, 2023 08:13
@dscho
Copy link
Member Author

dscho commented Nov 25, 2023

/deploy msys2-runtime-3.3

The workflow run was started.

@dscho dscho merged commit f4aa31f into git-for-windows:main Nov 25, 2023
4 checks passed
@dscho dscho deleted the some-backports-from-msys2-runtime-3.4 branch November 25, 2023 08:32
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.

1 participant