Skip to content

feat(builder): rebuild in hybrid mode #78

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
mattevans merged 1 commit into from
Dec 17, 2025
Merged

feat(builder): rebuild in hybrid mode #78

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
21 changes: 20 additions & 1 deletion pkg/builder/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"time"

"github.com/ethpandaops/xcli/pkg/config"
"github.com/ethpandaops/xcli/pkg/constants"
"github.com/ethpandaops/xcli/pkg/diagnostic"
executil "github.com/ethpandaops/xcli/pkg/exec"
"github.com/ethpandaops/xcli/pkg/ui"
Expand Down Expand Up @@ -342,7 +343,25 @@ func (m *Manager) GenerateXatuCBTProtosWithResult(ctx context.Context) *diagnost
m.log.WithError(err).Warn("failed to clean xatu-cbt protos, continuing anyway")
}

return m.runMakeWithResult(ctx, m.cfg.Repos.XatuCBT, "proto", diagnostic.PhaseProtoGen, "xatu-cbt")
// Build environment with xatu source configuration
// This allows proto generation to respect xcli's hybrid/external mode
env := os.Environ()

if m.cfg.Infrastructure.ClickHouse.Xatu.Mode == constants.InfraModeExternal {
env = append(env, "XATU_SOURCE=external")

if m.cfg.Infrastructure.ClickHouse.Xatu.ExternalURL != "" {
env = append(env, fmt.Sprintf("XATU_URL=%s", m.cfg.Infrastructure.ClickHouse.Xatu.ExternalURL))
}

m.log.WithField("xatu_source", "external").Debug("passing external mode to proto generation")
}

cmd := exec.CommandContext(ctx, "make", "proto")
cmd.Dir = m.cfg.Repos.XatuCBT
cmd.Env = env

return executil.RunCmdWithResult(cmd, m.verbose, diagnostic.PhaseProtoGen, "xatu-cbt")
}

// CleanXatuCBTProtos removes generated proto files from xatu-cbt.
Expand Down