[JENKINS-66810] Use case insensitive matching on Windows #1273
+70
−1
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
Contributor
Author
|
Hello @uhafner please review the changes. |
uhafner
reviewed
Nov 15, 2025
Comment on lines
+80
to
+117
|
|
||
| /** | ||
| * Finds the actual file path with correct capitalization on Windows. | ||
| * On Windows, file systems are case-insensitive but case-preserving, so we need to find the actual file name as it exists on disk. | ||
| * | ||
| * @param relativeFileName | ||
| * the relative file name (possibly with wrong capitalization) | ||
| * @param sourceDirectoryPrefix | ||
| * the source directory prefix | ||
| * | ||
| * @return the actual relative file name with correct capitalization, or empty if not found | ||
| */ | ||
| private Optional<String> findActualFilePath(final String relativeFileName, final String sourceDirectoryPrefix) { | ||
| if (!IS_WINDOWS) { | ||
| return PATH_UTIL.exists(relativeFileName, sourceDirectoryPrefix) | ||
| ? Optional.of(relativeFileName) | ||
| : Optional.empty(); | ||
| } | ||
|
|
||
| try { | ||
| var basePath = Path.of(sourceDirectoryPrefix); | ||
| var targetPath = basePath.resolve(relativeFileName); | ||
|
|
||
| if (!Files.exists(targetPath)) { | ||
| return Optional.empty(); | ||
| } | ||
|
|
||
| var realPath = targetPath.toRealPath(); | ||
|
|
||
| var relativePath = basePath.relativize(realPath); | ||
| String actualRelativeFileName = relativePath.toString().replace('\\', '/'); | ||
|
|
||
| return Optional.of(actualRelativeFileName); | ||
| } | ||
| catch (IOException | InvalidPathException exception) { | ||
| return Optional.empty(); | ||
| } | ||
| } |
Member
There was a problem hiding this comment.
Are you running on Windows? When I run your test without the changes in the FileNameResolver, then the tests passes (see #1275). It would make sense to produce a test that actually fails.
I see no value in the new code when the tests still passes without. The original issue was more a review task for me to look through the various code places (here and in the warnings plugin) to detect incompatibilities with Windows.
Contributor
Author
There was a problem hiding this comment.
Yes, I am running on Windows.
Member
There was a problem hiding this comment.
Does the test fail on your machine without your change?
7 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
JENKINS-66810 Use case insensitive matching on Windows
Testing done
Submitter checklist