flow: fix logic in os.Exec post run code

.github/workflows/hof.yml

@@ -16,7 +16,6 @@ jobs:
           - 1.21.x
         os:
           - ubuntu-latest
-          - macos-13
     environment: hof mod testing
     runs-on: ${{ matrix.os }}
     steps:

ci/gha/common/vars.cue

@@ -9,5 +9,5 @@ Formatters: [
 Versions: {
 	docker: "24.0.7"
 	go:     "1.21.x" | ["1.22.x", "1.21.x"]
-	os:     "ubuntu-latest" | ["ubuntu-latest", "macos-13"]
+	os:     "ubuntu-latest" | ["ubuntu-latest"]
 }

flow.cue

@@ -71,6 +71,12 @@ diff: F=_flow & {
 build: F= _flow & {
 	@flow(build)
 
+	gha: {
+		_cond
+    shouldi: F._shouldi & { globs: ["ci/gha"] }
+		run: "make workflow"
+	}
+
 	gen: {
 		_cond
     shouldi: F._shouldi & { globs: ["design/"] }
@@ -79,6 +85,7 @@ build: F= _flow & {
 
 	cli: {
 		_cond
+		#after: { $gen: F.gen }
     shouldi: F._shouldi & { globs: ["go.*", "cmd/", "flow", "lib/", "schema/", "script/"] }
 		run: "go install ./cmd/hof"
 	}

flow/tasks/os/exec.go

@@ -102,14 +102,6 @@ func (T *Exec) Run(ctx *hofcontext.Context) (interface{}, error) {
 	// build return value
 	ret := make(map[string]interface{})
 
-	if err != nil {
-		if doExit  {
-			return nil, err
-		}
-
-		ret["error"] = err.Error()
-	}
-
 	//
 	// possibly fill stdout/stderr
 	//
@@ -122,6 +114,15 @@ func (T *Exec) Run(ctx *hofcontext.Context) (interface{}, error) {
 	ret["exitcode"] = cmd.ProcessState.ExitCode()
 	ret["success"] = cmd.ProcessState.Success()
 
+	// fmt.Println("GOT HERE", err, v, ret)
+
+	if err != nil {
+		if doExit  {
+			return ret, err
+		}
+
+		ret["error"] = err.Error()
+	}
 	return ret, nil
 }