Skip to content

Commit 544ae63

Browse files
yjp20cjquines
authored andcommitted
fix: more merge conflict issues
1 parent 348101a commit 544ae63

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

go.mod

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ require (
1111
github.com/charmbracelet/huh v0.7.0
1212
github.com/charmbracelet/lipgloss v1.1.1-0.20250404203927-76690c660834
1313
github.com/charmbracelet/x/ansi v0.8.0
14+
github.com/charmbracelet/x/term v0.2.1
15+
github.com/itchyny/json2yaml v0.1.4
1416
github.com/logrusorgru/aurora/v4 v4.0.0
17+
github.com/muesli/reflow v0.3.0
1518
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
1619
github.com/stainless-api/stainless-api-go v0.24.0
1720
github.com/tidwall/gjson v1.17.0
@@ -32,7 +35,6 @@ require (
3235
github.com/charmbracelet/x/cellbuf v0.0.13 // indirect
3336
github.com/charmbracelet/x/exp/slice v0.0.0-20250327172914-2fdc97757edf // indirect
3437
github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0 // indirect
35-
github.com/charmbracelet/x/term v0.2.1 // indirect
3638
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
3739
github.com/dlclark/regexp2 v1.11.0 // indirect
3840
github.com/dustin/go-humanize v1.0.1 // indirect
@@ -46,7 +48,6 @@ require (
4648
github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
4749
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
4850
github.com/muesli/cancelreader v0.2.2 // indirect
49-
github.com/muesli/reflow v0.3.0 // indirect
5051
github.com/muesli/termenv v0.16.0 // indirect
5152
github.com/rivo/uniseg v0.4.7 // indirect
5253
github.com/russross/blackfriday/v2 v2.1.0 // indirect

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8=
6464
github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0=
6565
github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
6666
github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
67+
github.com/itchyny/json2yaml v0.1.4 h1:/pErVOXGG5iTyXHi/QKR4y3uzhLjGTEmmJIy97YT+k8=
68+
github.com/itchyny/json2yaml v0.1.4/go.mod h1:6iudhBZdarpjLFRNj+clWLAkGft+9uCcjAZYXUH9eGI=
6769
github.com/logrusorgru/aurora/v4 v4.0.0 h1:sRjfPpun/63iADiSvGGjgA1cAYegEWMPCJdUpJYn9JA=
6870
github.com/logrusorgru/aurora/v4 v4.0.0/go.mod h1:lP0iIa2nrnT/qoFXcOZSrZQpJ1o6n2CUf/hyHi2Q4ZQ=
6971
github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=

pkg/cmd/buildtargetoutput.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ func handleBuildsTargetOutputsRetrieve(ctx context.Context, cmd *cli.Command) er
8585
return err
8686
}
8787

88-
fmt.Printf("%s\n", ColorizeJSON(res.RawJSON(), os.Stdout))
88+
format := cmd.Root().String("format")
89+
fmt.Printf("%s\n", ShowJSON("builds:target_outputs retrieve", res.RawJSON(), format))
8990

9091
group := Info("Downloading output")
9192
if cmd.Bool("pull") {

0 commit comments

Comments
 (0)