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

feat(pkg-drv): allow setting custom aspect and kinds #3328

Merged
merged 4 commits into from
Oct 21, 2022
Merged

feat(pkg-drv): allow setting custom aspect and kinds #3328

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1200355
feat(pkg-drv): allow setting custom aspect and kinds
JamyDev Oct 20, 2022
8a66b41
Merge branch 'bazelbuild:master' into jamy/packagesdriver-custom-aspect
JamyDev Oct 20, 2022
2ef5582
fixup! use kinds array
JamyDev Oct 20, 2022
bf72488
fixup! format
JamyDev Oct 20, 2022
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
8 changes: 6 additions & 2 deletions go/tools/gopackagesdriver/bazel_json_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ func (b *BazelJSONBuilder) fileQuery(filename string) string {
fp, _ := filepath.Rel(b.bazel.WorkspaceRoot(), filename)
filename = fp
}
return fmt.Sprintf(`kind("go_library|go_test|go_binary", same_pkg_direct_rdeps("%s"))`, filename)
addtlKinds := ""
if len(additionalKinds) > 0 {
addtlKinds = "|" + strings.Join(additionalKinds, "|")
}
return fmt.Sprintf(`kind("go_library|go_test|go_binary%s", same_pkg_direct_rdeps("%s"))`, addtlKinds, filename)
JamyDev marked this conversation as resolved.
Show resolved Hide resolved
}

func (b *BazelJSONBuilder) packageQuery(importPath string) string {
Expand Down Expand Up @@ -120,7 +124,7 @@ func (b *BazelJSONBuilder) Build(ctx context.Context, mode LoadMode) ([]string,
"--experimental_convenience_symlinks=ignore",
"--ui_event_filters=-info,-stderr",
"--noshow_progress",
"--aspects=" + rulesGoRepositoryName + "//go/tools/gopackagesdriver:aspect.bzl%go_pkg_info_aspect",
"--aspects=" + customAspect,
"--output_groups=" + b.outputGroupsForMode(mode),
"--keep_going", // Build all possible packages
}, bazelFlags, bazelBuildFlags, labels)
Expand Down
2 changes: 2 additions & 0 deletions go/tools/gopackagesdriver/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ var (
bazelQueryScope = getenvDefault("GOPACKAGESDRIVER_BAZEL_QUERY_SCOPE", "")
bazelBuildFlags = strings.Fields(os.Getenv("GOPACKAGESDRIVER_BAZEL_BUILD_FLAGS"))
workspaceRoot = os.Getenv("BUILD_WORKSPACE_DIRECTORY")
customAspect = getenvDefault("GOPACKAGESDRIVER_BAZEL_ASPECT", rulesGoRepositoryName + "//go/tools/gopackagesdriver:aspect.bzl%go_pkg_info_aspect")
additionalKinds = strings.Fields(os.Getenv("GOPACKAGESDRIVER_BAZEL_KINDS"))
emptyResponse = &driverResponse{
NotHandled: false,
Sizes: types.SizesFor("gc", "amd64").(*types.StdSizes),
Expand Down