spindle/engines/nixery: fix panic when parsing environment variables #879

merged opened by

evan.jarrett.net 2 months ago targeting master from evan.jarrett.net/core: nixery-fix

Bugfix for code introduced in https://tangled.org/tangled.org/core/pulls/827

Labels

None yet.

assignee

None yet.

Participants 2

AT URI

at://did:plc:pddp4xt5lgnv2qsegbzzs4xg/sh.tangled.repo.pull/3m7rfdxqs6c22

+5 -3

1 changed file

Diff round #0

expand all

unified split

spindle

engines

nixery

engine.go

+5 -3

spindle/engines/nixery/engine.go

··· 294 294 workflowEnvs.AddEnv(s.Key, s.Value) 295 295 } 296 296 297 - step := w.Steps[idx].(Step) 297 + step := w.Steps[idx] 298 298 299 299 select { 300 300 case <-ctx.Done(): ··· 303 303 } 304 304 305 305 envs := append(EnvVars(nil), workflowEnvs...) 306 - for k, v := range step.environment { 307 - envs.AddEnv(k, v) 306 + if nixStep, ok := step.(Step); ok { 307 + for k, v := range nixStep.environment { 308 + envs.AddEnv(k, v) 309 + } 308 310 } 309 311 envs.AddEnv("HOME", homeDir) 310 312

History

1 round 1 comment

evan.jarrett.net submitted #0 2mo

1 commit

expand

ca1f699a

spindle/engines/nixery: fix panic when parsing environment variables

expand 1 comment

boltless.me 2mo

note: I'm still in progress of setting up my local spindle so I can't really check this working (my spindle still fails at other places). But from my broken spindle log, the error related to the issue seems to be resolved with this change.

So I'm optimistically merging this. Thank you for the contribution!

pull request successfully merged