Commit 7c5ac83
Eric Bower
·
2026-05-07 10:21:47 -0400 EDT
parent 386fa8c
style(runner): cleanup
1 files changed,
+13,
-11
M
main.go
M
main.go
+13,
-11
1@@ -370,12 +370,7 @@ func (eng *JobEngine) Setup() error {
2 return eng.Wk.Setup()
3 }
4
5-func (eng *JobEngine) Run() error {
6- manifest, err := eng.getManifest()
7- if err != nil {
8- return err
9- }
10-
11+func (eng *JobEngine) Run(manifest string) error {
12 prefix := fmt.Sprintf("ci.%s.%s.", eng.Ev.Name, eng.JobID)
13 // Child sessions use ".step." sub-prefix so zmx wait "*" inside pico.sh
14 // matches ci.<name>.<jobID>.step.* but NOT ci.<name>.<jobID>.runner.
15@@ -416,7 +411,7 @@ func (eng *JobEngine) Cleanup() error {
16 return eng.Wk.Cleanup()
17 }
18
19-func (eng *JobEngine) getManifest() (string, error) {
20+func (eng *JobEngine) FindManifest() (string, error) {
21 fnames := []string{"pico.sh"}
22 for _, manifest := range fnames {
23 path := filepath.Join(eng.Wk.GetDir(), manifest)
24@@ -424,7 +419,7 @@ func (eng *JobEngine) getManifest() (string, error) {
25 return path, nil
26 }
27 }
28- return "", fmt.Errorf("manifest not found in %s", eng.Wk.GetDir())
29+ return "", fmt.Errorf("no pico.sh found in %s", eng.Wk.GetDir())
30 }
31
32 func eventHandler(cfg *Cfg, eventData *Event) error {
33@@ -451,11 +446,11 @@ func eventHandler(cfg *Cfg, eventData *Event) error {
34 }
35 }()
36
37- fmt.Fprint(os.Stdout, "📦 syncing workspace...\n")
38+ fmt.Fprintf(os.Stdout, "📦 syncing workspace %s\n", eventData.Workspace)
39 if err := eng.Setup(); err != nil {
40 return fmt.Errorf("setup: %w", err)
41 }
42- fmt.Fprintln(os.Stdout, "✅ workspace ready")
43+ fmt.Fprintf(os.Stdout, "✅ workspace ready %s\n", eng.Wk.GetDir())
44
45 // Store the event in the artifact directory so the monitor can access it
46 eventBytes, _ := json.Marshal(eventData)
47@@ -468,8 +463,15 @@ func eventHandler(cfg *Cfg, eventData *Event) error {
48 }
49 }
50
51+ manifest, err := eng.FindManifest()
52+ if err != nil {
53+ fmt.Fprintf(os.Stdout, "❌ %s\n", err)
54+ return err
55+ }
56+ fmt.Fprintf(os.Stdout, "🔍 found %s\n", manifest)
57+
58 fmt.Fprint(os.Stdout, "🏃 launching sessions...\n")
59- if err := eng.Run(); err != nil {
60+ if err := eng.Run(manifest); err != nil {
61 return fmt.Errorf("run: %w", err)
62 }
63