Merge remote-tracking branch 'origin/main' into test-improvements

Author: jahvon

.goreleaser.yaml

@@ -26,10 +26,10 @@ builds:
       -X "github.com/jahvon/flow/cmd/internal/version.buildDate={{ .Date }}"
 
 gomod:
-  proxy: true
+  proxy: false
 
 archives:
-  - format: tar.gz
+  - formats: [ 'tar.gz' ]
     files:
       - LICENSE
       - README.md
@@ -40,25 +40,29 @@ archives:
       {{- .Os }}_
       {{- .Arch }}
 
-brews:
+homebrew_casks:
   - name: flow
+    binary: flow
+    conflicts:
+      - formula: flow
     homepage: https://flowexec.io
     license: Apache-2.0
-    directory: Formula
     repository:
       owner: jahvon
       name: homebrew-tap
       token: "{{ .Env.HOMEBREW_FLOW_GITHUB_TOKEN }}"
+    completions:
+      bash: completions/flow.bash
+      zsh: completions/flow.zsh
+      fish: completions/flow.fish
     dependencies:
-      - name: xclip
-        os: linux
-    install: |
-      bin.install "flow"
-      bash_completion.install "completions/flow.bash"
-      zsh_completion.install "completions/flow.zsh"
-      fish_completion.install "completions/flow.fish"
-    test: |
-      system "#{bin}/flow --version"
+      - cask: xclip # Required for clipboard support, only linux, so I need to figure out to get this to skip macOS
+    hooks:
+      post:
+        install: |
+          if system_command("/usr/bin/xattr", args: ["-h"]).exit_status == 0
+            system_command "/usr/bin/xattr", args: ["-dr", "com.apple.quarantine", "#{staged_path}/flow"]
+          end
   
 dockers:
   - image_templates:

internal/runner/serial/serial.go

@@ -112,7 +112,9 @@ func handleExec(
 			maps.Copy(execPromptedEnv, a)
 		}
 		fields := map[string]interface{}{"step": exec.ID()}
-		exec.Exec.SetLogFields(fields)
+		if exec.Exec != nil {
+			exec.Exec.SetLogFields(fields)
+		}
 
 		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: 5 * time.Second})
+	db, err := bolt.Open(dbPath, 0666, &bolt.Options{Timeout: 30 * time.Second})
 	if err != nil {
 		return nil, fmt.Errorf("failed to open db: %w", err)
 	}

internal/templates/templates.go

@@ -164,10 +164,12 @@ func runExecutables(
 			}
 			maps.Copy(execEnv, a)
 		}
-		exec.Exec.SetLogFields(map[string]interface{}{
-			"stage": stage,
-			"step":  i + 1,
-		})
+		if exec.Exec != nil {
+			exec.Exec.SetLogFields(map[string]interface{}{
+				"stage": stage,
+				"step":  i + 1,
+			})
+		}
 		if err := runner.Exec(ctx, exec, engine.NewExecEngine(), execEnv); err != nil {
 			return errors.Wrap(err, fmt.Sprintf("unable to execute %s executable %d", stage, i))
 		}