fix rerun and update tests

Author: Zettat123

models/actions/run.go

@@ -459,6 +459,14 @@ func UpdateRun(ctx context.Context, run *ActionRun, cols ...string) error {
 	return nil
 }
 
+// UpdateRunEventPayload updates ActionRun.EventPayload for an existing run.
+// It is only valid for runs triggered by "workflow_call" (reusable workflows), because only workflow_call runs
+// store a reusable-workflow payload whose inputs may need to be refreshed.
+func UpdateRunEventPayload(ctx context.Context, repoID, runID int64, payload string) error {
+	_, err := db.GetEngine(ctx).Exec("UPDATE action_run SET event_payload=? WHERE repo_id=? AND id=? AND trigger_event=?", payload, repoID, runID, "workflow_call")
+	return err
+}
+
 type ActionRunIndex db.ResourceIndex
 
 func GetConcurrentRunsAndJobs(ctx context.Context, repoID int64, concurrencyGroup string, status []Status) ([]*ActionRun, []*ActionRunJob, error) {

services/actions/job_emitter.go

@@ -106,6 +106,9 @@ func checkJobsByRunID(ctx context.Context, runID int64) error {
 			}
 		}
 		if job.ChildRunID > 0 && job.Status == actions_model.StatusWaiting {
+			if err := refreshChildRunEventPayload(ctx, job); err != nil {
+				log.Error("refresh reusable workflow call payload for parent job %d child run %d: %v", job.ID, job.ChildRunID, err)
+			}
 			if err := EmitJobsIfReadyByRun(job.ChildRunID); err != nil {
 				log.Error("Check jobs of run %d: %v", job.ChildRunID, err)
 			}

services/actions/reusable_workflow.go

@@ -73,22 +73,13 @@ func createChildRunFromReusableWorkflow(ctx context.Context, parentJob *actions_
 		return err
 	}
 
-	workflowCallPayload := &api.WorkflowCallPayload{
-		Workflow:   parentJobRun.WorkflowID,
-		Ref:        parentJobRun.Ref,
-		Repository: convert.ToRepo(ctx, parentJobRun.Repo, access_model.Permission{AccessMode: perm.AccessModeNone}),
-		Sender:     convert.ToUserWithAccessMode(ctx, parentJobRun.TriggerUser, perm.AccessModeNone),
-		Inputs:     inputsWithDefaults,
-		Secrets:    flattenWorkflowCallSecrets(parentJobRun, secretsMapping),
+	eventPayload, err := buildWorkflowCallEventPayload(ctx, parentJobRun, inputsWithDefaults, secretsMapping)
+	if err != nil {
+		return err
 	}
 
 	childRunTitle := fmt.Sprintf("%s / %s", parentJobRun.Title, parentJob.Name)
 
-	var eventPayload []byte
-	if eventPayload, err = workflowCallPayload.JSONPayload(); err != nil {
-		return fmt.Errorf("JSONPayload: %w", err)
-	}
-
 	childRun := &actions_model.ActionRun{
 		Title:       childRunTitle,
 		RepoID:      parentJobRun.RepoID,
@@ -119,6 +110,70 @@ func createChildRunFromReusableWorkflow(ctx context.Context, parentJob *actions_
 	return nil
 }
 
+func refreshChildRunEventPayload(ctx context.Context, parentJob *actions_model.ActionRunJob) error {
+	if parentJob.ChildRunID <= 0 {
+		return nil
+	}
+	if err := parentJob.LoadAttributes(ctx); err != nil {
+		return err
+	}
+
+	workflowJob, err := parentJob.ParseJob()
+	if err != nil {
+		return err
+	}
+	ref, err := act_pkg_runner.ParseReusableWorkflowRef(workflowJob.Uses)
+	if err != nil {
+		return err
+	}
+	content, err := loadReusableWorkflowContent(ctx, parentJob.Run, ref)
+	if err != nil {
+		return err
+	}
+
+	vars, err := actions_model.GetVariablesOfRun(ctx, parentJob.Run)
+	if err != nil {
+		return err
+	}
+	giteaCtx := GenerateGiteaContext(parentJob.Run, parentJob)
+	inputsWithDefaults, err := buildWorkflowCallInputs(ctx, parentJob, workflowJob, content, vars, giteaCtx)
+	if err != nil {
+		return err
+	}
+	secretsMapping, err := buildWorkflowCallSecrets(workflowJob, content)
+	if err != nil {
+		return err
+	}
+
+	eventPayload, err := buildWorkflowCallEventPayload(ctx, parentJob.Run, inputsWithDefaults, secretsMapping)
+	if err != nil {
+		return err
+	}
+
+	return actions_model.UpdateRunEventPayload(ctx, parentJob.RepoID, parentJob.ChildRunID, string(eventPayload))
+}
+
+func buildWorkflowCallEventPayload(ctx context.Context, parentRun *actions_model.ActionRun, inputs map[string]any, secretsMapping map[string]string) ([]byte, error) {
+	if err := parentRun.LoadAttributes(ctx); err != nil {
+		return nil, err
+	}
+
+	workflowCallPayload := &api.WorkflowCallPayload{
+		Workflow:   parentRun.WorkflowID,
+		Ref:        parentRun.Ref,
+		Repository: convert.ToRepo(ctx, parentRun.Repo, access_model.Permission{AccessMode: perm.AccessModeNone}),
+		Sender:     convert.ToUserWithAccessMode(ctx, parentRun.TriggerUser, perm.AccessModeNone),
+		Inputs:     inputs,
+		Secrets:    flattenWorkflowCallSecrets(parentRun, secretsMapping),
+	}
+
+	eventPayload, err := workflowCallPayload.JSONPayload()
+	if err != nil {
+		return nil, fmt.Errorf("JSONPayload: %w", err)
+	}
+	return eventPayload, nil
+}
+
 func buildWorkflowCallInputs(ctx context.Context, parentJob *actions_model.ActionRunJob, workflowJob *jobparser.Job, content []byte, vars map[string]string, giteaCtx GiteaContext) (map[string]any, error) {
 	singleWorkflow := &jobparser.SingleWorkflow{}
 	if err := yaml.Unmarshal(content, singleWorkflow); err != nil {