spindle/engine: clean up envs, stdout on dev and use new models #258

···

       
4
       
 
       
	"path"

     

       
5
       
 
       


     

       
6
       
 
       
	"tangled.sh/tangled.sh/core/api/tangled"

     

       
0
       
 
       

     

       
7
       
 
       
)

     

       
8
       
 
       


     

       
9
       
 
       
type Pipeline struct {

     
···

       
35
       
 
       
// In the process, dependencies are resolved: nixpkgs deps

     

       
36
       
 
       
// are constructed atop nixery and set as the Workflow.Image,

     

       
37
       
 
       
// and ones from custom registries

     

       
38
       
-
       
func ToPipeline(pl tangled.Pipeline, dev bool) *Pipeline {

     

       
39
       
 
       
	workflows := []Workflow{}

     

       
40
       
 
       


     

       
41
       
 
       
	for _, twf := range pl.Workflows {

     
···

       
49
       
 
       
		}

     

       
50
       
 
       
		swf.Name = twf.Name

     

       
51
       
 
       
		swf.Environment = workflowEnvToMap(twf.Environment)

     

       
52
       
-
       
		swf.Image = workflowImage(twf.Dependencies)

     

       
53
       
 
       


     

       
54
       
 
       
		swf.addNixProfileToPath()

     

       
55
       
 
       
		setup := &setupSteps{}

     

       
56
       
 
       


     

       
57
       
-
       
		setup.addStep(cloneStep(*twf, *pl.TriggerMetadata.Repo, dev))

     

       
58
       
 
       
		setup.addStep(checkoutStep(*twf, *pl.TriggerMetadata))

     

       
59
       
 
       
		setup.addStep(dependencyStep(*twf))

     

       
60
       
 
       


     
···

       
82
       
 
       
	return envMap

     

       
83
       
 
       
}

     

       
84
       
 
       


     

       
85
       
-
       
func workflowImage(deps []tangled.Pipeline_Dependencies_Elem) string {

     

       
86
       
 
       
	var dependencies string

     

       
87
       
 
       
	for _, d := range deps {

     

       
88
       
 
       
		if d.Registry == "nixpkgs" {

     
···

       
93
       
 
       
	// load defaults from somewhere else

     

       
94
       
 
       
	dependencies = path.Join(dependencies, "bash", "git", "coreutils", "nix")

     

       
95
       
 
       


     

       
96
       
-
       
	// TODO: this should use nixery from the config

     

       
97
       
-
       
	return path.Join("nixery.dev", dependencies)

     

       
98
       
 
       
}

     

       
99
       
 
       


     

       
100
       
 
       
func (wf *Workflow) addNixProfileToPath() {

     

···

       
4
       
 
       
	"path"

     

       
5
       
 
       


     

       
6
       
 
       
	"tangled.sh/tangled.sh/core/api/tangled"

     

       
7
       
+
       
	"tangled.sh/tangled.sh/core/spindle/config"

     

       
8
       
 
       
)

     

       
9
       
 
       


     

       
10
       
 
       
type Pipeline struct {

     
···

       
36
       
 
       
// In the process, dependencies are resolved: nixpkgs deps

     

       
37
       
 
       
// are constructed atop nixery and set as the Workflow.Image,

     

       
38
       
 
       
// and ones from custom registries

     

       
39
       
+
       
func ToPipeline(pl tangled.Pipeline, cfg config.Config) *Pipeline {

     

       
40
       
 
       
	workflows := []Workflow{}

     

       
41
       
 
       


     

       
42
       
 
       
	for _, twf := range pl.Workflows {

     
···

       
50
       
 
       
		}

     

       
51
       
 
       
		swf.Name = twf.Name

     

       
52
       
 
       
		swf.Environment = workflowEnvToMap(twf.Environment)

     

       
53
       
+
       
		swf.Image = workflowImage(twf.Dependencies, cfg.Pipelines.Nixery)

     

       
54
       
 
       


     

       
55
       
 
       
		swf.addNixProfileToPath()

     

       
56
       
 
       
		setup := &setupSteps{}

     

       
57
       
 
       


     

       
58
       
+
       
		setup.addStep(cloneStep(*twf, *pl.TriggerMetadata.Repo, cfg.Server.Dev))

     

       
59
       
 
       
		setup.addStep(checkoutStep(*twf, *pl.TriggerMetadata))

     

       
60
       
 
       
		setup.addStep(dependencyStep(*twf))

     

       
61
       
 
       


     
···

       
83
       
 
       
	return envMap

     

       
84
       
 
       
}

     

       
85
       
 
       


     

       
86
       
+
       
func workflowImage(deps []tangled.Pipeline_Dependencies_Elem, nixery string) string {

     

       
87
       
 
       
	var dependencies string

     

       
88
       
 
       
	for _, d := range deps {

     

       
89
       
 
       
		if d.Registry == "nixpkgs" {

     
···

       
94
       
 
       
	// load defaults from somewhere else

     

       
95
       
 
       
	dependencies = path.Join(dependencies, "bash", "git", "coreutils", "nix")

     

       
96
       
 
       


     

       
97
       
+
       
	return path.Join(nixery, dependencies)

     

       
0
       
 
       

     

       
98
       
 
       
}

     

       
99
       
 
       


     

       
100
       
 
       
func (wf *Workflow) addNixProfileToPath() {