Skip to content

Commit

Permalink
Auto-skip: exit on hashing failure (#3524)
Browse files Browse the repository at this point in the history 
This PR tweaks the behavior of auto-skip failures such that hashing
problems will force the CLI to exit.

Before:
```
$ ./build/linux/amd64/earthly --auto-skip +code      
 Init 🚀
————————————————————————————————————————————————————————————————————————————————

           auto-skip | unable to calculate hash for +code: circular dependency detected; +code already called
           buildkitd | Found buildkit daemon as docker container (earthly-dev-buildkitd)

Streaming logs to https://cloud.earthly.dev/builds/a3d9a6de-08fc-4967-a103-db3e13440bf4

 Build 🔧
————————————————————————————————————————————————————————————————————————————————

golang:1.21-alpine3.17 | --> Load metadata golang:1.21-alpine3.17 linux/amd64
...
```

After:
```
$ ./build/linux/amd64/earthly --auto-skip +code
 Init 🚀
————————————————————————————————————————————————————————————————————————————————

Error: unable to calculate hash for +code: circular dependency detected; +code already called
```
  • Loading branch information
@mikejholly
mikejholly authored Nov 23, 2023
1 parent a14acff commit d1617ec
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 13 deletions.
3 changes: 1 addition & 2 deletions cmd/earthly/subcmd/build_cmd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -852,8 +852,7 @@ func (a *Build) initAutoSkip(ctx context.Context, target domain.Target, overridi
EarthlyCIRunner: a.cli.Flags().EarthlyCIRunner,
})
if err != nil {
console.Warnf("unable to calculate hash for %s: %s", target.String(), err.Error())
return nil, nil, false, nil
return nil, nil, false, errors.Wrapf(err, "unable to calculate hash for %s", target)
}

skipDB, err = bk.NewBuildkitSkipper(a.cli.Flags().LocalSkipDB, orgName, projectName, target.GetName(), client)
Expand Down
17 changes: 6 additions & 11 deletions tests/autoskip/Earthfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ test-with-subdir:

test-requires-project:
RUN echo hello > my-file
DO --pass-args +RUN_EARTHLY_ARGS --earthfile=no-project.earth --target=+no-project --output_contains="I was run"
RUN if ! grep "PROJECT command missing" earthly.output >/dev/null; then echo "no warning displayed for missing PROJECT keyword" && exit 1; fi
DO --pass-args +RUN_EARTHLY_ARGS --earthfile=no-project.earth --target=+no-project --should_fail=true --output_contains="command missing"

test-wait:
DO --pass-args +RUN_EARTHLY_ARGS --earthfile=wait.earth --target=+test --output_contains="not skipped"
Expand Down Expand Up @@ -161,16 +160,12 @@ test-shell-out:
DO --pass-args +RUN_EARTHLY_ARGS --earthfile=shell-out.earth --target=+shell-out
DO --pass-args +RUN_EARTHLY_ARGS --earthfile=shell-out.earth --target=+shell-out --output_contains="target .* has already been run; exiting"

DO --pass-args +RUN_EARTHLY_ARGS --earthfile=shell-out.earth --target=+shell-out-target --output_contains="dynamic target"
DO --pass-args +RUN_EARTHLY_ARGS --earthfile=shell-out.earth --target=+shell-out-target --output_does_not_contain="target .* has already been run; exiting"

DO --pass-args +RUN_EARTHLY_ARGS --earthfile=shell-out.earth --target=+shell-out-target-2 --output_contains="dynamic target"
DO --pass-args +RUN_EARTHLY_ARGS --earthfile=shell-out.earth --target=+shell-out-target-2 --output_does_not_contain="target .* has already been run; exiting"
DO --pass-args +RUN_EARTHLY_ARGS --earthfile=shell-out.earth --target=+shell-out-target --should_fail=true --output_contains="dynamic target"
DO --pass-args +RUN_EARTHLY_ARGS --earthfile=shell-out.earth --target=+shell-out-target-2 --should_fail=true --output_contains="dynamic target"

RUN echo "foo" > my-file

DO --pass-args +RUN_EARTHLY_ARGS --earthfile=shell-out.earth --target=+shell-out-copy --output_contains="dynamic COPY source"
DO --pass-args +RUN_EARTHLY_ARGS --earthfile=shell-out.earth --target=+shell-out-copy --output_does_not_contain="target .* has already been run; exiting"
DO --pass-args +RUN_EARTHLY_ARGS --earthfile=shell-out.earth --target=+shell-out-copy --should_fail=true --output_contains="dynamic COPY source"

test-copy-if-exists:
DO --pass-args +RUN_EARTHLY_ARGS --earthfile=simple.earth --target=+copy-if-exists
Expand All @@ -193,12 +188,12 @@ test-remote-targets:
DO --pass-args +RUN_EARTHLY_ARGS --earthfile=remote-target.earth --target=+valid-from-sha
DO --pass-args +RUN_EARTHLY_ARGS --earthfile=remote-target.earth --target=+valid-from-sha --output_contains="target .* has already been run; exiting"

DO --pass-args +RUN_EARTHLY_ARGS --earthfile=remote-target.earth --target=+invalid-copy-branch --output_contains="complete Git SHA or tag"
DO --pass-args +RUN_EARTHLY_ARGS --earthfile=remote-target.earth --target=+invalid-copy-branch --should_fail=true --output_contains="complete Git SHA or tag"

DO --pass-args +RUN_EARTHLY_ARGS --earthfile=remote-target.earth --target=+valid-build
DO --pass-args +RUN_EARTHLY_ARGS --earthfile=remote-target.earth --target=+valid-build --output_contains="target .* has already been run; exiting"

DO --pass-args +RUN_EARTHLY_ARGS --earthfile=remote-target.earth --target=+invalid-build --output_contains="complete Git SHA or tag"
DO --pass-args +RUN_EARTHLY_ARGS --earthfile=remote-target.earth --target=+invalid-build --should_fail=true --output_contains="complete Git SHA or tag"

test-from-dockerfile:
RUN mkdir /dist
Expand Down

0 comments on commit d1617ec

Please sign in to comment.