refactor: change directory handling

Author: jahvon

internal/runner/parallel/parallel.go

@@ -61,7 +61,7 @@ func (r *parallelRunner) Exec(
 	return fmt.Errorf("no parallel executables to run")
 }
 
-//nolint:funlen
+//nolint:funlen,gocognit
 func handleExec(
 	ctx *context.Context, parent *executable.Executable,
 	eng engine.Engine,
@@ -117,21 +117,23 @@ func handleExec(
 			maps.Copy(execPromptedEnv, a)
 		}
 
-		var dir executable.Directory
 		switch {
 		case exec.Exec != nil:
 			fields := map[string]interface{}{"step": exec.ID()}
 			exec.Exec.SetLogFields(fields)
-			dir = exec.Exec.Dir
-		case parent.Parallel != nil:
-			dir = exec.Parallel.Dir
-		case parent.Serial != nil:
-			dir = exec.Serial.Dir
-		}
-		if dir == "" {
-			dir = parent.Parallel.Dir
+			if parallelSpec.Dir != "" && exec.Exec.Dir == "" {
+				exec.Exec.Dir = parallelSpec.Dir
+			}
+		case exec.Parallel != nil:
+			if parallelSpec.Dir != "" && exec.Parallel.Dir == "" {
+				exec.Parallel.Dir = parallelSpec.Dir
+			}
+		case exec.Serial != nil:
+			if parallelSpec.Dir != "" && exec.Serial.Dir == "" {
+				exec.Serial.Dir = parallelSpec.Dir
+			}
 		}
-		exec.Exec.Dir = dir
+
 		runExec := func() error {
 			err := runner.Exec(ctx, exec, eng, execPromptedEnv)
 			if err != nil {

internal/runner/serial/serial.go

@@ -60,7 +60,7 @@ func (r *serialRunner) Exec(
 	return fmt.Errorf("no serial executables to run")
 }
 
-//nolint:funlen
+//nolint:funlen,gocognit
 func handleExec(
 	ctx *context.Context,
 	parent *executable.Executable,
@@ -113,21 +113,22 @@ func handleExec(
 			maps.Copy(execPromptedEnv, a)
 		}
 
-		var dir executable.Directory
 		switch {
 		case exec.Exec != nil:
 			fields := map[string]interface{}{"step": exec.ID()}
 			exec.Exec.SetLogFields(fields)
-			dir = exec.Exec.Dir
-		case parent.Parallel != nil:
-			dir = exec.Parallel.Dir
-		case parent.Serial != nil:
-			dir = exec.Serial.Dir
-		}
-		if dir == "" {
-			dir = parent.Serial.Dir
+			if serialSpec.Dir != "" && exec.Exec.Dir == "" {
+				exec.Exec.Dir = serialSpec.Dir
+			}
+		case exec.Parallel != nil:
+			if serialSpec.Dir != "" && exec.Parallel.Dir == "" {
+				exec.Parallel.Dir = serialSpec.Dir
+			}
+		case exec.Serial != nil:
+			if serialSpec.Dir != "" && exec.Serial.Dir == "" {
+				exec.Serial.Dir = serialSpec.Dir
+			}
 		}
-		exec.Exec.Dir = dir
 
 		runExec := func() error {
 			return runSerialExecFunc(ctx, i, refConfig, exec, eng, execPromptedEnv, serialSpec)

internal/services/store/store.go

@@ -47,7 +47,7 @@ func NewStore(dbPath string) (Store, error) {
 	if dbPath == "" {
 		dbPath = Path()
 	}
-	db, err := bolt.Open(dbPath, 0666, &bolt.Options{Timeout: 30 * time.Second})
+	db, err := bolt.Open(dbPath, 0666, &bolt.Options{Timeout: 3 * time.Second})
 	if err != nil {
 		return nil, fmt.Errorf("failed to open db: %w", err)
 	}