Skip to content

Commit f309f42

Browse files
mikeakersclaude
andcommitted
fix(ci): add --server flag to all bd init calls for v1.0.0 compat
bd v1.0.0 defaults to embedded mode (requires CGO). CI builds bd with CGO_ENABLED=0, so all bd init calls that target the test Dolt server must pass --server explicitly. Fixes patrol, hook_slot, beads_db_init, and beads_routing integration tests. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent f67fedb commit f309f42

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

internal/beads/beads.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ func (b *Beads) Init(prefix string) error {
402402
}
403403
args = append(args, "--quiet")
404404
if b.serverPort > 0 {
405-
args = append(args, "--server-port", fmt.Sprintf("%d", b.serverPort))
405+
args = append(args, "--server", "--server-port", fmt.Sprintf("%d", b.serverPort))
406406
}
407407
_, err := b.run(args...)
408408
return err

internal/cmd/beads_db_init_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ func createTrackedBeadsRepoWithIssues(t *testing.T, path, prefix string, numIssu
7878
t.Fatalf("mkdir .beads: %v", err)
7979
}
8080

81-
// Run bd init (pass --server-port if GT_DOLT_PORT is set for ephemeral test servers)
81+
// Run bd init (pass --server for bd v1.0.0+ which defaults to embedded mode)
8282
bdInitArgs := []string{"init", "--prefix", prefix}
8383
if p := os.Getenv("GT_DOLT_PORT"); p != "" {
84-
bdInitArgs = append(bdInitArgs, "--server-port", p)
84+
bdInitArgs = append(bdInitArgs, "--server", "--server-port", p)
8585
}
8686
cmd := exec.Command("bd", bdInitArgs...)
8787
cmd.Dir = path
@@ -469,10 +469,10 @@ func createTrackedBeadsRepoWithNoIssues(t *testing.T, path, prefix string) {
469469
t.Fatalf("mkdir .beads: %v", err)
470470
}
471471

472-
// Run bd init (creates database but no issues; pass --server-port for ephemeral test servers)
472+
// Run bd init (creates database but no issues; pass --server for bd v1.0.0+)
473473
bdInitArgs2 := []string{"init", "--prefix", prefix}
474474
if p := os.Getenv("GT_DOLT_PORT"); p != "" {
475-
bdInitArgs2 = append(bdInitArgs2, "--server-port", p)
475+
bdInitArgs2 = append(bdInitArgs2, "--server", "--server-port", p)
476476
}
477477
cmd := exec.Command("bd", bdInitArgs2...)
478478
cmd.Dir = path

internal/cmd/beads_routing_integration_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,9 @@ func initBeadsDBWithPrefix(t *testing.T, dir, prefix string) {
137137

138138
args := []string{"init", "--quiet", "--prefix", prefix}
139139
// Forward GT_DOLT_PORT so bd connects to the ephemeral test server
140-
// instead of defaulting to port 3307.
140+
// instead of defaulting to port 3307. bd v1.0.0+ requires --server.
141141
if p := os.Getenv("GT_DOLT_PORT"); p != "" {
142-
args = append(args, "--server-port", p)
142+
args = append(args, "--server", "--server-port", p)
143143
}
144144
cmd := exec.Command("bd", args...)
145145
cmd.Dir = dir

internal/cmd/hook_slot_integration_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ func initBeadsDB(t *testing.T, dir string) {
105105
t.Helper()
106106
testutil.RequireDoltContainer(t)
107107

108-
cmd := exec.Command("bd", "init", "--server-port", testutil.DoltContainerPort())
108+
cmd := exec.Command("bd", "init", "--server", "--server-port", testutil.DoltContainerPort())
109109
cmd.Dir = dir
110110
if output, err := cmd.CombinedOutput(); err != nil {
111111
t.Fatalf("bd init failed: %v\n%s", err, output)

0 commit comments

Comments
 (0)