build-installers: include /etc/msystem.d when available
#623
+1
−0
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In 8316103 (make-file-list: unbreak `nuget/release.sh`, 2025-06-03), I introduced a check for that directory; Contingent on this, its contents are included in the file list that is used to build the installers. However, we need to imitate 2141a50 (make-file-list: do not expect /etc/bash.bash_logout to exist, 2025-02-26). That commit guarantees that the `bash_logout` file is checked out if it exists in the HEAD revision (so that the check for its presence in `make-file-list.sh` will not fail by mistake). Likewise, we need to ensure that `/etc/msystem.d/` is checked out (if it exists in HEAD). This bug prevented the Windows/ARM64 variant of Git for Windows' installer from containing the `/etc/msystem.d/` directory, which results in the annoying error message "bash: /etc/msystem.d/MSYS: No such file or directory" when running a Git Bash. Thanks to the extra special `/clangarm64` logic in the Git wrapper, it is merely an annoyance but does not break anything. This bug was hidden in the x64 build due to an unrelated change that fixed the build of the i686 `mingw-w64-git` package in `git-sdk-64`: git-for-windows/git-sdk-64@c3dc3a1bdcc9. This commit was done in reaction to the `git-artifacts` build failure at https://github.com/git-for-windows/git-sdk-64/actions/runs/15236505205/job/42851060773#step:10:207 where the `PATH` variable was not set up in accordance with `MSYSTEM=MINGW32` and therefore built the x64 variant by mistake when it should have built the x86 variant. The fix was to ensure that `/etc/msystem.d/` is included in `build-installers`, which kind of worked around the problem with the x64 build, but in a fragile way: Once we stop building the x86 MINGW packages in git-sdk-64, we can drop all of the x86 bits in git-sdk-64, including `makepkg-git-i686`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho
force-pushed
the
let-build-installers-include-msystem.d-when-available
branch
from
aa0ae0e to
5957537
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In #622, I fixed the NuGet package build, but that fix re-broke the aarch64 installer (and my testing on x64 -- as I have no Windows/ARM64 hardware -- was fooled by an unrelated fix that hid the bug).