shared container for job

pkg/runner/runner.go

@@ -13,7 +13,6 @@ import (
 // Runner provides capabilities to run GitHub actions
 type Runner interface {
 	NewPlanExecutor(plan *model.Plan) common.Executor
-	NewRunExecutor(run *model.Run, matrix map[string]interface{}) common.Executor
 }
 
 // Config contains the config for a new runner
@@ -59,49 +58,12 @@ func (runner *runnerImpl) NewPlanExecutor(plan *model.Plan) common.Executor {
 		stageExecutor := make([]common.Executor, 0)
 		for _, run := range stage.Runs {
 			job := run.Job()
-			matrixes := make([]map[string]interface{}, 0)
-			if job.Strategy != nil {
-				includes := make([]map[string]interface{}, 0)
-				for _, v := range job.Strategy.Matrix["include"] {
-					includes = append(includes, v.(map[string]interface{}))
-				}
-				delete(job.Strategy.Matrix, "include")
-
-				excludes := make([]map[string]interface{}, 0)
-				for _, v := range job.Strategy.Matrix["exclude"] {
-					excludes = append(excludes, v.(map[string]interface{}))
-				}
-				delete(job.Strategy.Matrix, "exclude")
-
-				matrixProduct := common.CartesianProduct(job.Strategy.Matrix)
-
-			MATRIX:
-				for _, matrix := range matrixProduct {
-					for _, exclude := range excludes {
-						if commonKeysMatch(matrix, exclude) {
-							log.Debugf("Skipping matrix '%v' due to exclude '%v'", matrix, exclude)
-							continue MATRIX
-						}
-					}
-					for _, include := range includes {
-						if commonKeysMatch(matrix, include) {
-							log.Debugf("Setting add'l values on matrix '%v' due to include '%v'", matrix, include)
-							for k, v := range include {
-								matrix[k] = v
-							}
-						}
-					}
-					matrixes = append(matrixes, matrix)
-				}
-
-			} else {
-				matrixes = append(matrixes, make(map[string]interface{}))
-			}
+			matrixes := job.GetMatrixes()
 
 			jobName := fmt.Sprintf("%-*s", maxJobNameLen, run.String())
 			for _, matrix := range matrixes {
 				m := matrix
-				runExecutor := runner.NewRunExecutor(run, matrix)
+				runExecutor := runner.newRunExecutor(run, matrix)
 				stageExecutor = append(stageExecutor, func(ctx context.Context) error {
 					ctx = WithJobLogger(ctx, jobName)
 					if len(m) > 0 {
@@ -117,22 +79,14 @@ func (runner *runnerImpl) NewPlanExecutor(plan *model.Plan) common.Executor {
 	return common.NewPipelineExecutor(pipeline...)
 }
 
-func commonKeysMatch(a map[string]interface{}, b map[string]interface{}) bool {
-	for aKey, aVal := range a {
-		if bVal, ok := b[aKey]; ok && aVal != bVal {
-			return false
-		}
+func (runner *runnerImpl) newRunExecutor(run *model.Run, matrix map[string]interface{}) common.Executor {
+	rc := &RunContext{
+		Config:      runner.config,
+		Run:         run,
+		EventJSON:   runner.eventJSON,
+		StepResults: make(map[string]*stepResult),
+		Matrix:      matrix,
 	}
-	return true
-}
-
-func (runner *runnerImpl) NewRunExecutor(run *model.Run, matrix map[string]interface{}) common.Executor {
-	rc := new(RunContext)
-	rc.Config = runner.config
-	rc.Run = run
-	rc.EventJSON = runner.eventJSON
-	rc.StepResults = make(map[string]*stepResult)
-	rc.Matrix = matrix
 	rc.ExprEval = rc.NewExpressionEvaluator()
 	return rc.Executor()
 }