diff options
| author | Peter Stone <thepeterstone@gmail.com> | 2026-03-25 05:31:14 +0000 |
|---|---|---|
| committer | Peter Stone <thepeterstone@gmail.com> | 2026-03-25 05:31:14 +0000 |
| commit | 9fe915674ee7e1f91771eb5fa5a73f99bcecef88 (patch) | |
| tree | 9d73f93639cda1404da008ce8d0290d98f9cb000 /internal/executor/executor.go | |
| parent | 436862484e53e9cf06b2594bcefd99621e603a72 (diff) | |
chore: replace all master branch references with main
- executor.go: merge story branch to main before deploy
- container.go: error messages reference git push origin main
- api/stories.go: create story branch from origin/main (drop master fallback)
- executor_test.go: test setup uses main branch
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Diffstat (limited to 'internal/executor/executor.go')
| -rw-r--r-- | internal/executor/executor.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/internal/executor/executor.go b/internal/executor/executor.go index 7213b34..9052bd7 100644 --- a/internal/executor/executor.go +++ b/internal/executor/executor.go @@ -512,13 +512,13 @@ func (p *Pool) triggerStoryDeploy(ctx context.Context, storyID string) { if proj.DeployScript == "" { return } - // Merge story branch to master before deploying (ADR-007). + // Merge story branch to main before deploying (ADR-007). if story.BranchName != "" && proj.LocalPath != "" { mergeSteps := [][]string{ {"git", "-C", proj.LocalPath, "fetch", "origin"}, - {"git", "-C", proj.LocalPath, "checkout", "master"}, + {"git", "-C", proj.LocalPath, "checkout", "main"}, {"git", "-C", proj.LocalPath, "merge", "--no-ff", story.BranchName, "-m", "Merge " + story.BranchName}, - {"git", "-C", proj.LocalPath, "push", "origin", "master"}, + {"git", "-C", proj.LocalPath, "push", "origin", "main"}, } for _, args := range mergeSteps { if mergeOut, mergeErr := exec.CommandContext(ctx, args[0], args[1:]...).CombinedOutput(); mergeErr != nil { @@ -526,7 +526,7 @@ func (p *Pool) triggerStoryDeploy(ctx context.Context, storyID string) { return } } - p.logger.Info("story branch merged to master", "storyID", storyID, "branch", story.BranchName) + p.logger.Info("story branch merged to main", "storyID", storyID, "branch", story.BranchName) } out, err := exec.CommandContext(ctx, proj.DeployScript).CombinedOutput() if err != nil { |