[gitattributes] Mark some llvm-rc inputs as requiring LF newlines #113222
Conversation
This file contains 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
|
This is an (untested) alternative to #113000, CC @llvm/pr-subscribers-windows. |
mstorsjo
force-pushed
the
gitattributes-llvm-rc
branch
from
22f44ed to
09914fb
Compare
|
I rebased this back to an older version of main, while the CRLF checkout .gitattributes were still in place, so that we can see if it actually does help fixing the issue. |
|
|
Right, the workers don't do a fresh clone, but only update on top of their existing checkout with faulty newlines... I'll keep this PR open for now, to keep in mind that we could apply this instead of #113000 once things are sorted out in the CI. |
These text files get embedded verbatim in llvm/test/tools/llvm-rc/tag-html.test, so their newlines form needs to match the expected form exactly. This reverts commit 2fdf49d, as that change no longer should be necessary. (At the time, buildbots had checkouts with all files having CRLF, and those don't get updated even if the toplevel .gitattributes were reverted in e669bbb. Now those buildbots have gotten fresh checkouts with all files having the right line endings.)
mstorsjo
force-pushed
the
gitattributes-llvm-rc
branch
from
09914fb to
9583672
Compare
|
The buildbots should have been refreshed now, and this solution with forcing the newlines for these specific files does work (I tested it in a separate checkout where |
|
Also, for context - see https://github.com/mstorsjo/llvm-project/actions/runs/11478930901/job/31944142725 for a list of other remaining failing tests if we'd do a fresh checkout with CRLF newlines. We have these two failing: Plus 73 Clang tests failing. |
dpaoliello
approved these changes
Oct 23, 2024
|
Thanks! FWIW, the same approach should also work as a remedy for the issues on AIX, where |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/123/builds/8035 Here is the relevant piece of the build log for the reference |
Closed
NoumanAmir657
pushed a commit
to NoumanAmir657/llvm-project
that referenced
this pull request
Nov 4, 2024
…vm#113222) These text files get embedded verbatim in llvm/test/tools/llvm-rc/tag-html.test, so their newlines form needs to match the expected form exactly. This reverts commit 2fdf49d, as that change no longer should be necessary. (At the time, buildbots had checkouts with all files having CRLF, and those don't get updated even if the toplevel .gitattributes were reverted in e669bbb. Now those buildbots have gotten fresh checkouts with all files having the right line endings.)
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.
These text files get embedded verbatim in llvm/test/tools/llvm-rc/tag-html.test, so their newlines form needs to match the expected form exactly.
This reverts commit 2fdf49d, as that change no longer should be necessary. (At the time, buildbots had checkouts with all files having CRLF, and those don't get updated even if the toplevel .gitattributes were reverted in e669bbb. Now those buildbots have gotten fresh checkouts with all files having the right line endings.)