From 9f334185deb8b1709357429b2cee3ac8ebe4893d Mon Sep 17 00:00:00 2001 From: Danilo Pantani Date: Thu, 4 Jul 2024 16:04:59 +0200 Subject: [PATCH 1/3] use buf build from the gobin path (#4242) (cherry picked from commit cfea8dd56cc65101086ca8d7c892be16d85dd389) # Conflicts: # ignite/pkg/cosmosbuf/buf.go --- ignite/pkg/cosmosbuf/buf.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/ignite/pkg/cosmosbuf/buf.go b/ignite/pkg/cosmosbuf/buf.go index 2ccc1c5737..8338d6e59c 100644 --- a/ignite/pkg/cosmosbuf/buf.go +++ b/ignite/pkg/cosmosbuf/buf.go @@ -9,6 +9,7 @@ import ( "golang.org/x/sync/errgroup" +<<<<<<< HEAD "github.com/ignite/cli/v28/ignite/pkg/cmdrunner/exec" "github.com/ignite/cli/v28/ignite/pkg/cosmosver" "github.com/ignite/cli/v28/ignite/pkg/errors" @@ -27,6 +28,15 @@ type ( sdkProtoDir string cache *protoanalysis.Cache } +======= + "github.com/ignite/cli/v29/ignite/pkg/cache" + "github.com/ignite/cli/v29/ignite/pkg/cmdrunner/exec" + "github.com/ignite/cli/v29/ignite/pkg/dircache" + "github.com/ignite/cli/v29/ignite/pkg/errors" + "github.com/ignite/cli/v29/ignite/pkg/goenv" + "github.com/ignite/cli/v29/ignite/pkg/xexec" + "github.com/ignite/cli/v29/ignite/pkg/xos" +>>>>>>> cfea8dd5 (use buf build from the gobin path (#4242)) ) const ( @@ -59,8 +69,13 @@ var ( ) // New creates a new Buf based on the installed binary. +<<<<<<< HEAD func New() (Buf, error) { path, err := xexec.ResolveAbsPath(binaryName) +======= +func New(cacheStorage cache.Storage, goModPath string) (Buf, error) { + path, err := xexec.ResolveAbsPath(filepath.Join(goenv.Bin(), binaryName)) +>>>>>>> cfea8dd5 (use buf build from the gobin path (#4242)) if err != nil { return Buf{}, err } From 037e936264151291f0392f43588b450846837a0d Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Thu, 4 Jul 2024 17:05:13 +0200 Subject: [PATCH 2/3] fix conflict --- ignite/pkg/cosmosbuf/buf.go | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/ignite/pkg/cosmosbuf/buf.go b/ignite/pkg/cosmosbuf/buf.go index 8338d6e59c..dec67c6e8f 100644 --- a/ignite/pkg/cosmosbuf/buf.go +++ b/ignite/pkg/cosmosbuf/buf.go @@ -9,10 +9,10 @@ import ( "golang.org/x/sync/errgroup" -<<<<<<< HEAD "github.com/ignite/cli/v28/ignite/pkg/cmdrunner/exec" "github.com/ignite/cli/v28/ignite/pkg/cosmosver" "github.com/ignite/cli/v28/ignite/pkg/errors" + "github.com/ignite/cli/v28/ignite/pkg/goenv" "github.com/ignite/cli/v28/ignite/pkg/protoanalysis" "github.com/ignite/cli/v28/ignite/pkg/xexec" "github.com/ignite/cli/v28/ignite/pkg/xos" @@ -28,15 +28,6 @@ type ( sdkProtoDir string cache *protoanalysis.Cache } -======= - "github.com/ignite/cli/v29/ignite/pkg/cache" - "github.com/ignite/cli/v29/ignite/pkg/cmdrunner/exec" - "github.com/ignite/cli/v29/ignite/pkg/dircache" - "github.com/ignite/cli/v29/ignite/pkg/errors" - "github.com/ignite/cli/v29/ignite/pkg/goenv" - "github.com/ignite/cli/v29/ignite/pkg/xexec" - "github.com/ignite/cli/v29/ignite/pkg/xos" ->>>>>>> cfea8dd5 (use buf build from the gobin path (#4242)) ) const ( @@ -69,13 +60,8 @@ var ( ) // New creates a new Buf based on the installed binary. -<<<<<<< HEAD func New() (Buf, error) { - path, err := xexec.ResolveAbsPath(binaryName) -======= -func New(cacheStorage cache.Storage, goModPath string) (Buf, error) { path, err := xexec.ResolveAbsPath(filepath.Join(goenv.Bin(), binaryName)) ->>>>>>> cfea8dd5 (use buf build from the gobin path (#4242)) if err != nil { return Buf{}, err } From 000fb24ddc26d1300bfca9895a3fc65b4bb3ba5e Mon Sep 17 00:00:00 2001 From: Danilo Pantani Date: Thu, 4 Jul 2024 20:43:12 +0200 Subject: [PATCH 3/3] add changelog --- changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.md b/changelog.md index c0e58d2ea0..23f22f9161 100644 --- a/changelog.md +++ b/changelog.md @@ -31,6 +31,7 @@ - [#4199](https://github.com/ignite/cli/pull/4199) Set and seal SDK global config in `app/config.go` - [#4212](https://github.com/ignite/cli/pull/4212) Set default values for extension flag to dont crash ignite - [#4216](https://github.com/ignite/cli/pull/4216) Avoid create duplicated scopedKeppers +- [#4242](https://github.com/ignite/cli/pull/4242) Use buf build binary from the gobin path ## [`v28.4.0`](https://github.com/ignite/cli/releases/tag/v28.4.0)