diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index d682ba8e..fb0e2a4a 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -3,6 +3,9 @@ name: Go Build and Test on: push: branches: [ "main" ] + paths-ignore: + - 'README.md' + - 'CHANGELOG.md' pull_request: branches: [ "main" ] diff --git a/.github/workflows/upgrade-test.yml b/.github/workflows/upgrade-test.yml index 66729c07..a9de465a 100644 --- a/.github/workflows/upgrade-test.yml +++ b/.github/workflows/upgrade-test.yml @@ -3,6 +3,9 @@ name: Upgrade Path Test on: push: branches: [ main ] + paths-ignore: + - 'README.md' + - 'CHANGELOG.md' pull_request: branches: [ main ] workflow_dispatch: diff --git a/cmd/dev.go b/cmd/dev.go index bb701b00..29347f15 100644 --- a/cmd/dev.go +++ b/cmd/dev.go @@ -7,6 +7,7 @@ import ( "os" "os/signal" "runtime" + "strings" "syscall" "time" @@ -83,6 +84,10 @@ Examples: serverAddr, _ := cmd.Flags().GetString("server") + if strings.Contains(apiUrl, "agentuity.io") && !strings.Contains(serverAddr, "localhost") { + serverAddr = "localhost:12001" + } + server, err := dev.New(dev.ServerArgs{ Ctx: ctx, Logger: log, @@ -163,6 +168,7 @@ Examples: if err == bundler.ErrBuildFailed { return } + ui.Close(true) errsystem.New(errsystem.ErrInvalidConfiguration, err, errsystem.WithContextMessage(fmt.Sprintf("Failed to bundle project: %s", err))).ShowErrorAndExit() } ok = true diff --git a/internal/bundler/upgrade.go b/internal/bundler/upgrade.go index 6a7dce48..e5452f8e 100644 --- a/internal/bundler/upgrade.go +++ b/internal/bundler/upgrade.go @@ -216,11 +216,10 @@ func checkForBreakingChanges(ctx BundleContext, language string, runtime string) if c.Check(currentVersion) { if change.Callback != nil { var proceed bool - if tui.HasTTY { + if tui.HasTTY && !ctx.DevMode { tui.ShowBanner(change.Title, change.Message, true) } else { - tui.Text(change.Title + " - " + change.Message) - return fmt.Errorf("migration required") + return fmt.Errorf("migration required: %s. %s", change.Title, change.Message) } proceed = tui.AskForConfirm("Would you like to migrate your project now?", 'y') == 'y' if proceed { @@ -232,7 +231,7 @@ func checkForBreakingChanges(ctx BundleContext, language string, runtime string) return fmt.Errorf("migration required") } } else { - if tui.HasTTY { + if tui.HasTTY && !ctx.DevMode { tui.ShowBanner(change.Title, change.Message, true) os.Exit(1) } else { diff --git a/internal/dev/tui.go b/internal/dev/tui.go index 4a529579..0a757c8e 100644 --- a/internal/dev/tui.go +++ b/internal/dev/tui.go @@ -418,6 +418,8 @@ func (d *DevModeUI) Close(abort bool) { d.once.Do(func() { d.aborting = abort d.program.Quit() + <-d.Done() + fmt.Fprint(os.Stdout, "\033c") }) }