Skip to content

chore: remove unused buildvars.ComposeBuildDir Var #9704

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

Merged
matthewmcneely merged 1 commit into from
May 18, 2026
+5 −16
Merged

chore: remove unused buildvars.ComposeBuildDir Var #9704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 1 addition & 9 deletions buildvars/buildvars.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,7 @@ type Var struct {
// override is set. Mutually exclusive with defaulter: when
// defaulter is non-nil, it computes the default and defaultValue
// is empty; when defaulter is nil, defaultValue holds the answer
// (possibly the empty string, which is a valid default for vars
// like ComposeBuildDir).
// (the empty string is a valid default).
defaultValue string

// defaulter, when non-nil, computes the default at Get() time.
Expand Down Expand Up @@ -202,12 +201,6 @@ var (
// RuntimeTag is the tag for RuntimeImage.
RuntimeTag = newVar("RUNTIME_TAG", "24.04")

// ComposeBuildDir holds generated docker-compose overlays produced
// by a compose-rewriting build step. Test harnesses route
// docker-compose invocations through this directory when set.
// Upstream default: empty (no overlay).
ComposeBuildDir = newVar("DGRAPH_COMPOSE_BUILD_DIR", "")

// BuildTags is the space-separated list of Go build tags passed to
// `go build` via -tags. The upstream default composes "jemalloc"
// (the well-known libjemalloc tag) with any tags a fork adds via
Expand Down Expand Up @@ -340,7 +333,6 @@ var All = []*Var{
BuildTag,
RuntimeImage,
RuntimeTag,
ComposeBuildDir,
BuildTags,
CustomBuildTags,
GoRunTags,
Expand Down
1 change: 0 additions & 1 deletion buildvars/buildvars_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@ func TestPackageDefaults(t *testing.T) {
{BuildTag, "24.04"},
{RuntimeImage, "ubuntu"},
{RuntimeTag, "24.04"},
{ComposeBuildDir, ""},
{GoBinDgraphPath, "/gobin/dgraph"},
}
for _, c := range cases {
Expand Down
10 changes: 4 additions & 6 deletions t/hooks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,10 @@ var EnvForCompose = defaultEnvForCompose
// unchanged, matching upstream behavior where the pristine compose file
// passes straight through.
//
// A fork running a compose-file generator may override this to rewrite
// the path to a generated overlay (e.g. under $DGRAPH_COMPOSE_BUILD_DIR)
// and add "--project-directory <original-dir>" so relative bind-mount
// sources resolve against the pristine test package dir rather than the
// overlay output dir. Unknown paths or an empty $DGRAPH_COMPOSE_BUILD_DIR
// fall through to the upstream-compatible "-f <path>" form.
// A fork may override this to layer additional `-f <overlay>` files,
// switch the compose-file path, or add `--project-directory <dir>` so
// relative bind-mount sources resolve against the pristine test package
// dir rather than wherever the override emits its base file.
var ComposeFileArgs = defaultComposeFileArgs

func defaultEnvForCompose() []string { return nil }
Expand Down
Loading