From 657a3d768c8fa092c89cb5420997d919c3962a4b Mon Sep 17 00:00:00 2001 From: Andreas Taylor Date: Mon, 13 May 2024 10:41:28 -0500 Subject: [PATCH] Fix for issue 2232: Many lines of "Could not find any stages to run" on run (#2272) * Initial commit * Put the tests back * Remove unnecessary checks * Remove unneeded check and fix test code --------- Co-authored-by: Jason Song --- cmd/root.go | 5 +++++ pkg/model/planner.go | 4 ---- pkg/model/planner_test.go | 9 ++------- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index 44d8cddd..55f339c1 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -479,6 +479,11 @@ func newRunCommand(ctx context.Context, input *Input) func(*cobra.Command, []str log.Debugf("Planning jobs for event: %s", eventName) plan, plannerErr = planner.PlanEvent(eventName) } + if plan != nil { + if len(plan.Stages) == 0 { + plannerErr = fmt.Errorf("Could not find any stages to run. View the valid jobs with `act --list`. Use `act --help` to find how to filter by Job ID/Workflow/Event Name") + } + } if plan == nil && plannerErr != nil { return plannerErr } diff --git a/pkg/model/planner.go b/pkg/model/planner.go index 4d23c082..6e9489c0 100644 --- a/pkg/model/planner.go +++ b/pkg/model/planner.go @@ -382,10 +382,6 @@ func createStages(w *Workflow, jobIDs ...string) ([]*Stage, error) { stages = append(stages, stage) } - if len(stages) == 0 { - return nil, fmt.Errorf("Could not find any stages to run. View the valid jobs with `act --list`. Use `act --help` to find how to filter by Job ID/Workflow/Event Name") - } - return stages, nil } diff --git a/pkg/model/planner_test.go b/pkg/model/planner_test.go index e41f6690..2857c2c8 100644 --- a/pkg/model/planner_test.go +++ b/pkg/model/planner_test.go @@ -51,13 +51,8 @@ func TestWorkflow(t *testing.T) { }, } - // Check that an invalid job id returns error - result, err := createStages(&workflow, "invalid_job_id") - assert.NotNil(t, err) - assert.Nil(t, result) - - // Check that an valid job id returns non-error - result, err = createStages(&workflow, "valid_job") + // Check that a valid job id returns non-error + result, err := createStages(&workflow, "valid_job") assert.Nil(t, err) assert.NotNil(t, result) }