From 9ffe5c053c1fad61b5c7abb8621ba6d46acf2130 Mon Sep 17 00:00:00 2001 From: Sam Alba Date: Wed, 14 Apr 2021 16:27:15 -0700 Subject: [PATCH] solver: fixed lint error (double import) Signed-off-by: Sam Alba --- dagger/solver.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dagger/solver.go b/dagger/solver.go index 0e313081..3a78c0c1 100644 --- a/dagger/solver.go +++ b/dagger/solver.go @@ -14,7 +14,6 @@ import ( bkgw "github.com/moby/buildkit/frontend/gateway/client" "github.com/moby/buildkit/session" "github.com/moby/buildkit/session/auth/authprovider" - "github.com/moby/buildkit/solver/pb" bkpb "github.com/moby/buildkit/solver/pb" "github.com/opencontainers/go-digest" "github.com/rs/zerolog/log" @@ -38,14 +37,14 @@ func NewSolver(control *bk.Client, gw bkgw.Client, events chan *bk.SolveStatus, func invalidateCache(def *llb.Definition) error { for _, dt := range def.Def { - var op pb.Op + var op bkpb.Op if err := (&op).Unmarshal(dt); err != nil { return err } dgst := digest.FromBytes(dt) opMetadata, ok := def.Metadata[dgst] if !ok { - opMetadata = pb.OpMetadata{} + opMetadata = bkpb.OpMetadata{} } c := llb.Constraints{Metadata: opMetadata} llb.IgnoreCache(&c)