do not process inputs if workflowDispatch is nil

Author: wxiaoguang

routers/api/v1/repo/action.go

@@ -772,21 +772,19 @@ func ActionsDispatchWorkflow(ctx *context.APIContext) {
 		Doer: ctx.Doer,
 		Repo: ctx.Repo,
 	}, workflowID, opt.Ref, func(workflowDispatch *model.WorkflowDispatch, inputs map[string]any) error {
-		if workflowDispatch != nil {
-			// TODO figure out why the inputs map is empty for url form encoding workaround
-			if opt.Inputs == nil {
-				for name, config := range workflowDispatch.Inputs {
-					value := ctx.FormString("inputs["+name+"]", config.Default)
+		// TODO figure out why the inputs map is empty for url form encoding workaround
+		if opt.Inputs == nil {
+			for name, config := range workflowDispatch.Inputs {
+				value := ctx.FormString("inputs["+name+"]", config.Default)
+				inputs[name] = value
+			}
+		} else {
+			for name, config := range workflowDispatch.Inputs {
+				value, ok := opt.Inputs[name] // FIXME: the input value is "any", does GitHub Actions really work with "any" (eg: bool)?
+				if ok {
 					inputs[name] = value
-				}
-			} else {
-				for name, config := range workflowDispatch.Inputs {
-					value, ok := opt.Inputs[name] // FIXME: the input value is "any", does GitHub Actions really work with "any" (eg: bool)?
-					if ok {
-						inputs[name] = value
-					} else {
-						inputs[name] = config.Default
-					}
+				} else {
+					inputs[name] = config.Default
 				}
 			}
 		}

routers/web/repo/actions/view.go

@@ -788,16 +788,14 @@ func Run(ctx *context_module.Context) {
 		return
 	}
 	err := actions_service.DispatchActionWorkflow(ctx, workflowID, ref, func(workflowDispatch *model.WorkflowDispatch, inputs map[string]any) error {
-		if workflowDispatch != nil {
-			for name, config := range workflowDispatch.Inputs {
-				value := ctx.Req.PostFormValue(name)
-				if config.Type == "boolean" {
-					inputs[name] = strconv.FormatBool(ctx.FormBool(name))
-				} else if value != "" {
-					inputs[name] = value
-				} else {
-					inputs[name] = config.Default
-				}
+		for name, config := range workflowDispatch.Inputs {
+			value := ctx.Req.PostFormValue(name)
+			if config.Type == "boolean" {
+				inputs[name] = strconv.FormatBool(ctx.FormBool(name))
+			} else if value != "" {
+				inputs[name] = value
+			} else {
+				inputs[name] = config.Default
 			}
 		}
 		return nil

services/actions/workflow.go

@@ -221,9 +221,10 @@ func DispatchActionWorkflow(ctx *context.Context, workflowID, ref string, proces
 		RawOn: workflows[0].RawOn,
 	}
 	inputsWithDefaults := make(map[string]any)
-	workflowDispatch := workflow.WorkflowDispatchConfig()
-	if err := processInputs(workflowDispatch, inputsWithDefaults); err != nil {
-		return err
+	if workflowDispatch := workflow.WorkflowDispatchConfig(); workflowDispatch != nil {
+		if err = processInputs(workflowDispatch, inputsWithDefaults); err != nil {
+			return err
+		}
 	}
 
 	// ctx.Req.PostForm -> WorkflowDispatchPayload.Inputs -> ActionRun.EventPayload -> runner: ghc.Event