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

build-installers: do include the 7-Zip DLL #530

Merged

Conversation

dscho
Copy link
Member

@dscho dscho commented Sep 13, 2023

This is a brown paper bag fix for #527

In 537c34a (Stop using p7zip, use 7-Zip instead, 2023-08-25), I
switched Git for Windows to using the MINGW variant of 7-Zip instead of
the MSYS variant of p7zip.

However, there was a quite obvious mistake where I specified 7z.exe to
be included in the `build-installers` sdk-artifact _twice_, and 7z.dll
not at all.

The intention was to specify both, one time each, which is what this
here commit does.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho dscho self-assigned this Sep 13, 2023
@dscho
Copy link
Member Author

dscho commented Sep 13, 2023

The symptom of the bug fixed by this here PR can be seen here: https://github.com/git-for-windows/git-sdk-32/actions/runs/6167519248/job/16739133510#step:7:37

@dscho dscho merged commit 93f53d7 into git-for-windows:main Sep 13, 2023
@dscho dscho deleted the fix-7z-in-build-installers-artifact branch September 13, 2023 07:52
rimrul added a commit to rimrul/git that referenced this pull request Oct 11, 2023
We've switched from p7zip to regular 7-Zip recently[1][2][3].
With that we don't need to monitor p7zip for updates anymore, but
we want to stay informed about 7-Zip updates now. Change the feed
accordingly. Since the new feed contains 15 different files as
separate items for the latest 7-Zip update, aggregate them into a
single issue.

[1] git-for-windows/build-extra#526
[2] git-for-windows/build-extra#527
[3] git-for-windows/build-extra#530

Signed-off-by: Matthias Aßhauer <mha1993@live.de>
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