Merge pull request #1323 from jlongtine/result-instead-of-state

We need to use the State() function, rather than Result().ToState()
This commit is contained in:
Joel Longtine 2022-01-03 14:49:48 -07:00 committed by GitHub
commit 7f944eaee7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions

View File

@ -217,7 +217,7 @@ func (p *Pipeline) doOp(ctx context.Context, op *compiler.Value, st llb.State) (
if err != nil { if err != nil {
return st, nil return st, nil
} }
return fs.Result().ToState() return fs.State()
} }
do, err := op.Lookup("do").String() do, err := op.Lookup("do").String()

View File

@ -60,7 +60,7 @@ func (t *buildTask) dockerfile(ctx context.Context, pctx *plancontext.Context, s
return nil, err return nil, err
} }
sourceSt, err := source.Result().ToState() sourceSt, err := source.State()
if err != nil { if err != nil {
return nil, err return nil, err
} }

View File

@ -51,7 +51,7 @@ func (t *mkdirTask) Run(ctx context.Context, pctx *plancontext.Context, s solver
} }
// Retrieve input llb state // Retrieve input llb state
inputState, err := input.Result().ToState() inputState, err := input.State()
if err != nil { if err != nil {
return nil, err return nil, err
} }

View File

@ -27,7 +27,7 @@ func (c outputDirectoryTask) Run(ctx context.Context, pctx *plancontext.Context,
return nil, err return nil, err
} }
st, err := contents.Result().ToState() st, err := contents.State()
if err != nil { if err != nil {
return nil, err return nil, err
} }

View File

@ -50,7 +50,7 @@ func (c *pushTask) Run(ctx context.Context, pctx *plancontext.Context, s solver.
if err != nil { if err != nil {
return nil, err return nil, err
} }
st, err := input.Result().ToState() st, err := input.State()
if err != nil { if err != nil {
return nil, err return nil, err
} }