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.

Sign up for GitHub

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

Jump to bottom

[7.1.0] [credentialhelper] Support paths relative to %install_base% #21532

Merged
merged 2 commits into from
Mar 4, 2024
Merged

[7.1.0] [credentialhelper] Support paths relative to %install_base% #21532

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d9285f
[credentialhelper] Support paths relative to `%install_base%`
Yannic Feb 29, 2024
8fefe31
Merge branch 'release-7.1.0' into cp21419-7.1.0
meteorcloudy Mar 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/main/java/com/google/devtools/build/lib/runtime/CommandLinePathFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,16 @@ static CommandLinePathFactory create(FileSystem fileSystem, BlazeDirectories dir
ImmutableMap.Builder<String, Path> wellKnownRoots = ImmutableMap.builder();

// This is necessary because some tests don't have a workspace set.
Path workspace = directories.getWorkspace();
var workspace = directories.getWorkspace();
if (workspace != null) {
wellKnownRoots.put("workspace", workspace);
}

var installBase = directories.getInstallBase();
if (installBase != null) {
wellKnownRoots.put("install_base", installBase);
}

return new CommandLinePathFactory(fileSystem, wellKnownRoots.buildOrThrow());
}

Expand Down
Loading