tjh.dev
forked from
tangled.org/core
Mirror of @tangled.org/core. Running on a Raspberry Pi Zero 2 (Please be gentle).
workflow,spindle: regenerate api with new lexicon
Signed-off-by: oppiliappan <me@oppi.li>
oppi.li
+16
-14
api/tangled/cbor_gen.go
api/tangled/cbor_gen.go
This is a binary file and will not be displayed.
api/tangled/tangledpipeline.go
api/tangled/tangledpipeline.go
This is a binary file and will not be displayed.
+2
-4
cmd/gen.go
+2
-4
cmd/gen.go
···
24
24
tangled.KnotMember{},
25
25
tangled.Pipeline{},
26
26
tangled.Pipeline_CloneOpts{},
27
-
tangled.Pipeline_Dependencies_Elem{},
27
+
tangled.Pipeline_Dependency{},
28
28
tangled.Pipeline_ManualTriggerData{},
29
-
tangled.Pipeline_ManualTriggerData_Inputs_Elem{},
29
+
tangled.Pipeline_Pair{},
30
30
tangled.Pipeline_PullRequestTriggerData{},
31
31
tangled.Pipeline_PushTriggerData{},
32
-
tangled.Pipeline_Step_Environment_Elem{},
33
32
tangled.PipelineStatus{},
34
33
tangled.Pipeline_Step{},
35
34
tangled.Pipeline_TriggerMetadata{},
36
35
tangled.Pipeline_TriggerRepo{},
37
36
tangled.Pipeline_Workflow{},
38
-
tangled.Pipeline_Workflow_Environment_Elem{},
39
37
tangled.PublicKey{},
40
38
tangled.Repo{},
41
39
tangled.RepoArtifact{},
+9
-5
spindle/models/pipeline.go
+9
-5
spindle/models/pipeline.go
···
83
83
return &Pipeline{Workflows: workflows}
84
84
}
85
85
86
-
func workflowEnvToMap(envs []*tangled.Pipeline_Workflow_Environment_Elem) map[string]string {
86
+
func workflowEnvToMap(envs []*tangled.Pipeline_Pair) map[string]string {
87
87
envMap := map[string]string{}
88
88
for _, env := range envs {
89
-
envMap[env.Key] = env.Value
89
+
if env != nil {
90
+
envMap[env.Key] = env.Value
91
+
}
90
92
}
91
93
return envMap
92
94
}
93
95
94
-
func stepEnvToMap(envs []*tangled.Pipeline_Step_Environment_Elem) map[string]string {
96
+
func stepEnvToMap(envs []*tangled.Pipeline_Pair) map[string]string {
95
97
envMap := map[string]string{}
96
98
for _, env := range envs {
97
-
envMap[env.Key] = env.Value
99
+
if env != nil {
100
+
envMap[env.Key] = env.Value
101
+
}
98
102
}
99
103
return envMap
100
104
}
101
105
102
-
func workflowImage(deps []tangled.Pipeline_Dependencies_Elem, nixery string) string {
106
+
func workflowImage(deps []*tangled.Pipeline_Dependency, nixery string) string {
103
107
var dependencies string
104
108
for _, d := range deps {
105
109
if d.Registry == "nixpkgs" {
+2
-2
workflow/compile.go
+2
-2
workflow/compile.go
···
98
98
Name: s.Name,
99
99
}
100
100
for k, v := range s.Environment {
101
-
e := &tangled.Pipeline_Step_Environment_Elem{
101
+
e := &tangled.Pipeline_Pair{
102
102
Key: k,
103
103
Value: v,
104
104
}
···
107
107
cw.Steps = append(cw.Steps, &step)
108
108
}
109
109
for k, v := range w.Environment {
110
-
e := &tangled.Pipeline_Workflow_Environment_Elem{
110
+
e := &tangled.Pipeline_Pair{
111
111
Key: k,
112
112
Value: v,
113
113
}
+3
-3
workflow/def.go
+3
-3
workflow/def.go
···
167
167
}
168
168
169
169
// conversion utilities to atproto records
170
-
func (d Dependencies) AsRecord() []tangled.Pipeline_Dependencies_Elem {
171
-
var deps []tangled.Pipeline_Dependencies_Elem
170
+
func (d Dependencies) AsRecord() []*tangled.Pipeline_Dependency {
171
+
var deps []*tangled.Pipeline_Dependency
172
172
for registry, packages := range d {
173
-
deps = append(deps, tangled.Pipeline_Dependencies_Elem{
173
+
deps = append(deps, &tangled.Pipeline_Dependency{
174
174
Registry: registry,
175
175
Packages: packages,
176
176
})