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
| ... | ... | @@ -370,12 +370,7 @@ func (eng *JobEngine) Setup() error { | |
| 370 | 370 | return eng.Wk.Setup() | |
| 371 | 371 | } | |
| 372 | 372 | ||
| 373 | - | func (eng *JobEngine) Run() error { | |
| 374 | - | manifest, err := eng.getManifest() | |
| 375 | - | if err != nil { | |
| 376 | - | return err | |
| 377 | - | } | |
| 378 | - | ||
| 373 | + | func (eng *JobEngine) Run(manifest string) error { | |
| 379 | 374 | prefix := fmt.Sprintf("ci.%s.%s.", eng.Ev.Name, eng.JobID) | |
| 380 | 375 | // Child sessions use ".step." sub-prefix so zmx wait "*" inside pico.sh | |
| 381 | 376 | // matches ci.<name>.<jobID>.step.* but NOT ci.<name>.<jobID>.runner. |
| ... | ... | @@ -416,7 +411,7 @@ func (eng *JobEngine) Cleanup() error { | |
| 416 | 411 | return eng.Wk.Cleanup() | |
| 417 | 412 | } | |
| 418 | 413 | ||
| 419 | - | func (eng *JobEngine) getManifest() (string, error) { | |
| 414 | + | func (eng *JobEngine) FindManifest() (string, error) { | |
| 420 | 415 | fnames := []string{"pico.sh"} | |
| 421 | 416 | for _, manifest := range fnames { | |
| 422 | 417 | path := filepath.Join(eng.Wk.GetDir(), manifest) |
| ... | ... | @@ -424,7 +419,7 @@ func (eng *JobEngine) getManifest() (string, error) { | |
| 424 | 419 | return path, nil | |
| 425 | 420 | } | |
| 426 | 421 | } | |
| 427 | - | return "", fmt.Errorf("manifest not found in %s", eng.Wk.GetDir()) | |
| 422 | + | return "", fmt.Errorf("no pico.sh found in %s", eng.Wk.GetDir()) | |
| 428 | 423 | } | |
| 429 | 424 | ||
| 430 | 425 | func eventHandler(cfg *Cfg, eventData *Event) error { |
| ... | ... | @@ -451,11 +446,11 @@ func eventHandler(cfg *Cfg, eventData *Event) error { | |
| 451 | 446 | } | |
| 452 | 447 | }() | |
| 453 | 448 | ||
| 454 | - | fmt.Fprint(os.Stdout, "📦 syncing workspace...\n") | |
| 449 | + | fmt.Fprintf(os.Stdout, "📦 syncing workspace %s\n", eventData.Workspace) | |
| 455 | 450 | if err := eng.Setup(); err != nil { | |
| 456 | 451 | return fmt.Errorf("setup: %w", err) | |
| 457 | 452 | } | |
| 458 | - | fmt.Fprintln(os.Stdout, "✅ workspace ready") | |
| 453 | + | fmt.Fprintf(os.Stdout, "✅ workspace ready %s\n", eng.Wk.GetDir()) | |
| 459 | 454 | ||
| 460 | 455 | // Store the event in the artifact directory so the monitor can access it | |
| 461 | 456 | eventBytes, _ := json.Marshal(eventData) |
| ... | ... | @@ -468,8 +463,15 @@ func eventHandler(cfg *Cfg, eventData *Event) error { | |
| 468 | 463 | } | |
| 469 | 464 | } | |
| 470 | 465 | ||
| 466 | + | manifest, err := eng.FindManifest() | |
| 467 | + | if err != nil { | |
| 468 | + | fmt.Fprintf(os.Stdout, "❌ %s\n", err) | |
| 469 | + | return err | |
| 470 | + | } | |
| 471 | + | fmt.Fprintf(os.Stdout, "🔍 found %s\n", manifest) | |
| 472 | + | ||
| 471 | 473 | fmt.Fprint(os.Stdout, "🏃 launching sessions...\n") | |
| 472 | - | if err := eng.Run(); err != nil { | |
| 474 | + | if err := eng.Run(manifest); err != nil { | |
| 473 | 475 | return fmt.Errorf("run: %w", err) | |
| 474 | 476 | } | |
| 475 | 477 |