kjuulh/dagger
Archived
1
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

plan: raise error on cyclic task + cue error formatting

Browse Source 
Signed-off-by: Sam Alba <samalba@users.noreply.github.com>
This commit is contained in:
Sam Alba 2022-03-09 16:26:39 -08:00
parent e4f284c4ea
commit c5660995f5
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cue.mod/pkg/.gitignore vendored
View File

@ -1,4 +0,0 @@
# generated by dagger
dagger.lock
dagger.io
universe.dagger.io

9
plan/runner.go
View File

@ -107,6 +107,11 @@ func (r *Runner) initTasks() {
} }
func (r *Runner) addTask(t *cueflow.Task) { func (r *Runner) addTask(t *cueflow.Task) {
// avoid circular dependencies
if _, ok := r.tasks.Load(t.Path().String()); ok {
return
}
r.tasks.Store(t.Path().String(), struct{}{}) r.tasks.Store(t.Path().String(), struct{}{})
for _, dep := range t.Dependencies() { for _, dep := range t.Dependencies() {
@ -156,9 +161,9 @@ func (r *Runner) taskFunc(flowVal cue.Value) (cueflow.Runner, error) {
if strings.Contains(err.Error(), "context canceled") { if strings.Contains(err.Error(), "context canceled") {
lg.Error().Dur("duration", time.Since(start)).Str("state", string(task.StateCanceled)).Msg(string(task.StateCanceled)) lg.Error().Dur("duration", time.Since(start)).Str("state", string(task.StateCanceled)).Msg(string(task.StateCanceled))
} else { } else {
lg.Error().Dur("duration", time.Since(start)).Err(err).Str("state", string(task.StateFailed)).Msg(string(task.StateFailed)) lg.Error().Dur("duration", time.Since(start)).Err(compiler.Err(err)).Str("state", string(task.StateFailed)).Msg(string(task.StateFailed))
} }
return fmt.Errorf("%s: %w", t.Path().String(), err) return fmt.Errorf("%s: %w", t.Path().String(), compiler.Err(err))
} }
lg.Info().Dur("duration", time.Since(start)).Str("state", string(task.StateCompleted)).Msg(string(task.StateCompleted)) lg.Info().Dur("duration", time.Since(start)).Str("state", string(task.StateCompleted)).Msg(string(task.StateCompleted))