Fix Windows CI #4199
Merged
Fix Windows CI #4199
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
The git-lfs-config manual page has trailing whitespace. Let's remove it.
We currently intend for our CI check for trailing whitespace to be fatal; that is, if any trailing whitespace is present, our CI script should fail. However, currently that doesn't work, since apparently set -e is not concerned with a negated pipeline having a nonzero exit code. To make things more robust, let's make this into an if statement and exit 1 if we match any files (that is, if grep returns 0). Note that this used to work because it was the last command in the file, but it no longer does for the above reason.
Traditionally, symbolic links on Unix have the size of the destination in bytes, whereas symbolic links on Windows have a full block size as their size on disk. While this is normally not a problem, it has caused a significant amount of pain for users that share repositories using symlinks between a Windows version of Git and a Linux version using the Windows Subsystem for Linux, since the index stores the size of all files and Git would always see these files as modified. Git for Windows 2.27.0 introduced a very desirable feature, which is that for Git, the size of a symlink stored in the index is always computed based on the Unix approach, which means that a repository can be shared. However, it came with a significant bug. If the core.fscache option is enabled, a different lstat implementation is used, which does not have that fix applied. As a result, when that option is enabled, as it is on GitHub Actions, all symbolic links perpetually appear to be modified, even though git diff does not show any differences. git reset --hard similarly has no effect. This causes our cibuild script to fail, since we do a git reset --hard, format files, and then look for any modified files. Fortunately, this issue is fixed in Git for Windows 2.28.0, but that version isn't available via Chocolatey right now, so let's roll back to 2.26.2 until GitHub Actions updates to the latest version.
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.
This series addresses a couple of problems with our CI system.
The commits are, as usual, logical and bisectable with sane commit messages.