Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
8329de0af3
3 changed files with 5 additions and 5 deletions
|
@ -99,7 +99,7 @@ func (s *setup) do(ctx context.Context, stage *core.Stage) error {
|
|||
|
||||
updated, err := s.updateBuild(ctx, build)
|
||||
if err != nil {
|
||||
logger.WithError(err).Warnln("manager: cannot bupdate the build")
|
||||
logger.WithError(err).Warnln("manager: cannot update the build")
|
||||
return err
|
||||
}
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@ type Dag struct {
|
|||
graph map[string]*Vertex
|
||||
}
|
||||
|
||||
// Vertex is a vetex in the graph.
|
||||
// Vertex is a vertex in the graph.
|
||||
type Vertex struct {
|
||||
Name string
|
||||
Skip bool
|
||||
|
@ -28,7 +28,7 @@ type Vertex struct {
|
|||
}
|
||||
|
||||
// New creates a new directed acyclic graph (dag) that can
|
||||
// determinte if a stage has dependencies.
|
||||
// determinate if a stage has dependencies.
|
||||
func New() *Dag {
|
||||
return &Dag{
|
||||
graph: make(map[string]*Vertex),
|
||||
|
@ -58,7 +58,7 @@ func (d *Dag) Dependencies(name string) []string {
|
|||
return d.dependencies(vertex)
|
||||
}
|
||||
|
||||
// Ancestors returns the acentors of the vertex.
|
||||
// Ancestors returns the ancestors of the vertex.
|
||||
func (d *Dag) Ancestors(name string) []*Vertex {
|
||||
vertex := d.graph[name]
|
||||
return d.ancestors(vertex)
|
||||
|
|
|
@ -410,7 +410,7 @@ func (t *triggerer) Trigger(ctx context.Context, repo *core.Repository, base *co
|
|||
for _, stage := range stages {
|
||||
// here we re-work the dependencies for the stage to
|
||||
// account for the fact that some steps may be skipped
|
||||
// and may otherwise break the dependnecy chain.
|
||||
// and may otherwise break the dependency chain.
|
||||
stage.DependsOn = dag.Dependencies(stage.Name)
|
||||
|
||||
// if the stage is pending dependencies, but those
|
||||
|
|
Loading…
Reference in a new issue