fixes

worker2/dag.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"github.com/hephbuild/heph/utils/ads"
 	"github.com/hephbuild/heph/utils/sets"
-	"github.com/hephbuild/heph/utils/xtypes"
 	"strings"
 	"sync"
 )
@@ -55,10 +54,6 @@ func (d *Node[T]) AddDependency(deps ...*Node[T]) {
 }
 
 func (d *Node[T]) addDependency(dep *Node[T]) {
-	if xtypes.IsNil(dep) {
-		return
-	}
-
 	if !d.dependencies.Has(dep) {
 		if dep.HasTransitiveDependency(d) {
 			panic("cycle")

worker2/dep.go

@@ -2,6 +2,7 @@ package worker2
 
 import (
 	"context"
+	"github.com/hephbuild/heph/utils/xtypes"
 	"sync"
 	"time"
 )
@@ -59,6 +60,9 @@ func (a *baseDep) GetNode() *Node[Dep] {
 
 func (a *baseDep) AddDep(deps ...Dep) {
 	for _, dep := range deps {
+		if xtypes.IsNil(dep) {
+			continue
+		}
 		if named, ok := dep.(Named); ok {
 			a.named[named.Name] = dep
 			dep = named.Dep

worker2/engine.go

@@ -105,12 +105,13 @@ func (e *Engine) waitForDeps(exec *Execution) error {
 	exec.c.L.Lock()
 	defer exec.c.L.Unlock()
 
+	var errs []error
 	for {
 		depObj := exec.Dep.GetNode()
 
 		allDepsSucceeded := true
 		allDepsDone := true
-		var errs []error
+		errs = errs[:0]
 		for _, dep := range depObj.Dependencies() {
 			depExec := e.scheduleOne(dep)
 
@@ -183,7 +184,7 @@ func (e *Engine) waitForDepsAndSchedule(exec *Execution) {
 	if exec.scheduler == nil {
 		if _, ok := exec.Dep.(*Group); ok {
 			// TODO: change to properly use ResourceScheduler
-			exec.scheduler = groupSchedulers
+			exec.scheduler = groupScheduler
 		} else {
 			exec.scheduler = e.defaultScheduler
 		}
@@ -193,7 +194,7 @@ func (e *Engine) waitForDepsAndSchedule(exec *Execution) {
 	e.queue(exec)
 }
 
-var groupSchedulers = NewLimitScheduler(runtime.NumCPU())
+var groupScheduler = NewLimitScheduler(runtime.NumCPU())
 
 func (e *Engine) queue(exec *Execution) {
 	e.notifyQueued(exec)