p79813206
/
act
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

skip unsupported platforms 

Signed-off-by: Casey Lee <cplee@nektos.com>
This commit is contained in:
Casey Lee 2020-02-16 22:04:13 -08:00
parent 73559207c7
commit 5b7019cd0b
No known key found for this signature in database
GPG Key ID: 1899120ECD0A1784
6 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/root.go
View File

@ -62,8 +62,8 @@ func newRunCommand(ctx context.Context, input *Input) func(*cobra.Command, []str
var eventName string
if len(args) > 0 {
eventName = args[0]
} else if events := planner.GetEvents(); len(events) == 1 {
// set default event type if we only have a single workflow in the file.
} else if events := planner.GetEvents(); len(events) > 1 {
// set default event type to first event
// this way user dont have to specify the event.
log.Debugf("Using detected workflow event: %s", events[0])
eventName = events[0]

2
pkg/common/executor.go
View File

@ -42,7 +42,7 @@ func NewInfoExecutor(format string, args ...interface{}) Executor {
// NewPipelineExecutor creates a new executor from a series of other executors
func NewPipelineExecutor(executors ...Executor) Executor {
if executors == nil {
if len(executors) == 0 {
return func(ctx context.Context) error {
return nil
}

1
pkg/model/planner.go
View File

@ -64,6 +64,7 @@ func NewWorkflowPlanner(dirname string) (WorkflowPlanner, error) {
return nil, err
}
log.Debugf("Reading workflow '%s'", f.Name())
workflow, err := ReadWorkflow(f)
if err != nil {
f.Close()

5
pkg/runner/run_context.go
View File

@ -33,6 +33,7 @@ type RunContext struct {
ExtraPath []string
CurrentStep string
StepResults map[string]*stepResult
PlatformName string
}
type stepResult struct {
@ -55,6 +56,10 @@ func (rc *RunContext) Close(ctx context.Context) error {
// Executor returns a pipeline executor for all the steps in the job
func (rc *RunContext) Executor() common.Executor {
if img := platformImage(rc.PlatformName); img == "" {
return common.NewInfoExecutor(" \U0001F6A7 Skipping unsupported platform '%s'", rc.PlatformName)
}
err := rc.setupTempDir()
if err != nil {
return common.NewErrorExecutor(err)

3
pkg/runner/runner.go
View File

@ -79,6 +79,9 @@ func (runner *runnerImpl) NewRunExecutor(run *model.Run, matrix map[string]inter
rc.EventJSON = runner.eventJSON
rc.StepResults = make(map[string]*stepResult)
rc.Matrix = matrix
ee := rc.NewExpressionEvaluator()
rc.PlatformName = ee.Interpolate(run.Job().RunsOn)
return func(ctx context.Context) error {
ctx = WithJobLogger(ctx, rc.Run.String())
return rc.Executor()(ctx)

4
pkg/runner/step.go
View File

@ -34,7 +34,7 @@ func (rc *RunContext) newStepExecutor(step *model.Step) common.Executor {
containerSpec.Volumes = job.Container.Volumes
containerSpec.Options = job.Container.Options
} else {
containerSpec.Image = platformImage(ee.Interpolate(job.RunsOn))
containerSpec.Image = platformImage(rc.PlatformName)
}
return common.NewPipelineExecutor(
rc.setupShellCommand(containerSpec, step.Shell, step.Run),
@ -154,7 +154,7 @@ func (rc *RunContext) setupShellCommand(containerSpec *model.ContainerSpec, shel
}
func platformImage(platform string) string {
switch platform {
switch strings.ToLower(platform) {
case "ubuntu-latest", "ubuntu-18.04":
return "ubuntu:18.04"
case "ubuntu-16.04":