Skip to content

Commit

Permalink
use buf build from the gobin path (#4242)
Browse files Browse the repository at this point in the history
(cherry picked from commit cfea8dd)

# Conflicts:
#	ignite/pkg/cosmosbuf/buf.go
  • Loading branch information
Pantani authored and mergify[bot] committed Jul 4, 2024
1 parent ef44b5a commit 9f33418
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions ignite/pkg/cosmosbuf/buf.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (

"golang.org/x/sync/errgroup"

<<<<<<< HEAD

Check failure on line 12 in ignite/pkg/cosmosbuf/buf.go

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest)

missing import path

Check failure on line 12 in ignite/pkg/cosmosbuf/buf.go

View workflow job for this annotation

GitHub Actions / test network on ubuntu-latest

missing import path

Check failure on line 12 in ignite/pkg/cosmosbuf/buf.go

View workflow job for this annotation

GitHub Actions / test network on macos-latest

missing import path

Check failure on line 12 in ignite/pkg/cosmosbuf/buf.go

View workflow job for this annotation

GitHub Actions / Lint Go code

missing import path (typecheck)
"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"
Expand All @@ -27,6 +28,15 @@ type (
sdkProtoDir string
cache *protoanalysis.Cache
}
=======

Check failure on line 31 in ignite/pkg/cosmosbuf/buf.go

View workflow job for this annotation

GitHub Actions / Lint Go code

expected 'IDENT', found '==' (typecheck)
"github.com/ignite/cli/v29/ignite/pkg/cache"
"github.com/ignite/cli/v29/ignite/pkg/cmdrunner/exec"

Check failure on line 33 in ignite/pkg/cosmosbuf/buf.go

View workflow job for this annotation

GitHub Actions / Lint Go code

expected 'IDENT', found "github.com/ignite/cli/v29/ignite/pkg/cmdrunner/exec" (typecheck)
"github.com/ignite/cli/v29/ignite/pkg/dircache"

Check failure on line 34 in ignite/pkg/cosmosbuf/buf.go

View workflow job for this annotation

GitHub Actions / Lint Go code

expected 'IDENT', found "github.com/ignite/cli/v29/ignite/pkg/dircache" (typecheck)
"github.com/ignite/cli/v29/ignite/pkg/errors"

Check failure on line 35 in ignite/pkg/cosmosbuf/buf.go

View workflow job for this annotation

GitHub Actions / Lint Go code

expected 'IDENT', found "github.com/ignite/cli/v29/ignite/pkg/errors" (typecheck)
"github.com/ignite/cli/v29/ignite/pkg/goenv"

Check failure on line 36 in ignite/pkg/cosmosbuf/buf.go

View workflow job for this annotation

GitHub Actions / Lint Go code

expected 'IDENT', found "github.com/ignite/cli/v29/ignite/pkg/goenv" (typecheck)
"github.com/ignite/cli/v29/ignite/pkg/xexec"

Check failure on line 37 in ignite/pkg/cosmosbuf/buf.go

View workflow job for this annotation

GitHub Actions / Lint Go code

expected 'IDENT', found "github.com/ignite/cli/v29/ignite/pkg/xexec" (typecheck)
"github.com/ignite/cli/v29/ignite/pkg/xos"

Check failure on line 38 in ignite/pkg/cosmosbuf/buf.go

View workflow job for this annotation

GitHub Actions / Lint Go code

expected 'IDENT', found "github.com/ignite/cli/v29/ignite/pkg/xos" (typecheck)
>>>>>>> cfea8dd5 (use buf build from the gobin path (#4242))

Check failure on line 39 in ignite/pkg/cosmosbuf/buf.go

View workflow job for this annotation

GitHub Actions / Lint Go code

expected 'IDENT', found '>>' (typecheck)
)

const (
Expand Down Expand Up @@ -59,8 +69,13 @@ var (
)

// New creates a new Buf based on the installed binary.
<<<<<<< HEAD

Check failure on line 72 in ignite/pkg/cosmosbuf/buf.go

View workflow job for this annotation

GitHub Actions / Lint Go code

expected declaration, found '<<' (typecheck)
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
}
Expand Down

0 comments on commit 9f33418

Please sign in to comment.