[gitea] week 2025-04 cherry pick (gitea/main -> forgejo) (#6623)

+8 -2

modules/git/diff.go

··· 64 64 } else if commit.ParentCount() == 0 { 65 65 cmd.AddArguments("show").AddDynamicArguments(endCommit).AddDashesAndList(files...) 66 66 } else { 67 - c, _ := commit.Parent(0) 67 + c, err := commit.Parent(0) 68 + if err != nil { 69 + return err 70 + } 68 71 cmd.AddArguments("diff", "-M").AddDynamicArguments(c.ID.String(), endCommit).AddDashesAndList(files...) 69 72 } 70 73 case RawDiffPatch: ··· 74 77 } else if commit.ParentCount() == 0 { 75 78 cmd.AddArguments("format-patch", "--no-signature", "--stdout", "--root").AddDynamicArguments(endCommit).AddDashesAndList(files...) 76 79 } else { 77 - c, _ := commit.Parent(0) 80 + c, err := commit.Parent(0) 81 + if err != nil { 82 + return err 83 + } 78 84 query := fmt.Sprintf("%s...%s", endCommit, c.ID.String()) 79 85 cmd.AddArguments("format-patch", "--no-signature", "--stdout").AddDynamicArguments(query).AddDashesAndList(files...) 80 86 }

+2

modules/git/ref_test.go

··· 20 20 21 21 // Test pull names 22 22 assert.Equal(t, "1", RefName("refs/pull/1/head").PullName()) 23 + assert.True(t, RefName("refs/pull/1/head").IsPull()) 24 + assert.True(t, RefName("refs/pull/1/merge").IsPull()) 23 25 assert.Equal(t, "my/pull", RefName("refs/pull/my/pull/head").PullName()) 24 26 25 27 // Test for branch names

+11 -133

routers/api/actions/runner/utils.go

··· 8 8 "fmt" 9 9 10 10 actions_model "code.gitea.io/gitea/models/actions" 11 - "code.gitea.io/gitea/models/db" 12 11 secret_model "code.gitea.io/gitea/models/secret" 13 - actions_module "code.gitea.io/gitea/modules/actions" 14 - "code.gitea.io/gitea/modules/container" 15 - "code.gitea.io/gitea/modules/git" 16 - "code.gitea.io/gitea/modules/json" 17 12 "code.gitea.io/gitea/modules/log" 18 - "code.gitea.io/gitea/modules/setting" 19 13 "code.gitea.io/gitea/services/actions" 20 14 21 15 runnerv1 "code.gitea.io/actions-proto-go/runner/v1" ··· 65 59 } 66 60 67 61 func generateTaskContext(t *actions_model.ActionTask) *structpb.Struct { 68 - event := map[string]any{} 69 - _ = json.Unmarshal([]byte(t.Job.Run.EventPayload), &event) 70 - 71 - // TriggerEvent is added in https://github.com/go-gitea/gitea/pull/25229 72 - // This fallback is for the old ActionRun that doesn't have the TriggerEvent field 73 - // and should be removed in 1.22 74 - eventName := t.Job.Run.TriggerEvent 75 - if eventName == "" { 76 - eventName = t.Job.Run.Event.Event() 77 - } 78 - 79 - baseRef := "" 80 - headRef := "" 81 - ref := t.Job.Run.Ref 82 - sha := t.Job.Run.CommitSHA 83 - if pullPayload, err := t.Job.Run.GetPullRequestEventPayload(); err == nil && pullPayload.PullRequest != nil && pullPayload.PullRequest.Base != nil && pullPayload.PullRequest.Head != nil { 84 - baseRef = pullPayload.PullRequest.Base.Ref 85 - headRef = pullPayload.PullRequest.Head.Ref 86 - 87 - // if the TriggerEvent is pull_request_target, ref and sha need to be set according to the base of pull request 88 - // In GitHub's documentation, ref should be the branch or tag that triggered workflow. But when the TriggerEvent is pull_request_target, 89 - // the ref will be the base branch. 90 - if t.Job.Run.TriggerEvent == actions_module.GithubEventPullRequestTarget { 91 - ref = git.BranchPrefix + pullPayload.PullRequest.Base.Name 92 - sha = pullPayload.PullRequest.Base.Sha 93 - } 94 - } 95 - 96 - refName := git.RefName(ref) 97 - 98 62 giteaRuntimeToken, err := actions.CreateAuthorizationToken(t.ID, t.Job.RunID, t.JobID) 99 63 if err != nil { 100 64 log.Error("actions.CreateAuthorizationToken failed: %v", err) 101 65 } 102 66 103 - taskContext, err := structpb.NewStruct(map[string]any{ 104 - // standard contexts, see https://docs.github.com/en/actions/learn-github-actions/contexts#github-context 105 - "action": "", // string, The name of the action currently running, or the id of a step. GitHub removes special characters, and uses the name __run when the current step runs a script without an id. If you use the same action more than once in the same job, the name will include a suffix with the sequence number with underscore before it. For example, the first script you run will have the name __run, and the second script will be named __run_2. Similarly, the second invocation of actions/checkout will be actionscheckout2. 106 - "action_path": "", // string, The path where an action is located. This property is only supported in composite actions. You can use this path to access files located in the same repository as the action. 107 - "action_ref": "", // string, For a step executing an action, this is the ref of the action being executed. For example, v2. 108 - "action_repository": "", // string, For a step executing an action, this is the owner and repository name of the action. For example, actions/checkout. 109 - "action_status": "", // string, For a composite action, the current result of the composite action. 110 - "actor": t.Job.Run.TriggerUser.Name, // string, The username of the user that triggered the initial workflow run. If the workflow run is a re-run, this value may differ from github.triggering_actor. Any workflow re-runs will use the privileges of github.actor, even if the actor initiating the re-run (github.triggering_actor) has different privileges. 111 - "api_url": setting.AppURL + "api/v1", // string, The URL of the GitHub REST API. 112 - "base_ref": baseRef, // string, The base_ref or target branch of the pull request in a workflow run. This property is only available when the event that triggers a workflow run is either pull_request or pull_request_target. 113 - "env": "", // string, Path on the runner to the file that sets environment variables from workflow commands. This file is unique to the current step and is a different file for each step in a job. For more information, see "Workflow commands for GitHub Actions." 114 - "event": event, // object, The full event webhook payload. You can access individual properties of the event using this context. This object is identical to the webhook payload of the event that triggered the workflow run, and is different for each event. The webhooks for each GitHub Actions event is linked in "Events that trigger workflows." For example, for a workflow run triggered by the push event, this object contains the contents of the push webhook payload. 115 - "event_name": eventName, // string, The name of the event that triggered the workflow run. 116 - "event_path": "", // string, The path to the file on the runner that contains the full event webhook payload. 117 - "graphql_url": "", // string, The URL of the GitHub GraphQL API. 118 - "head_ref": headRef, // string, The head_ref or source branch of the pull request in a workflow run. This property is only available when the event that triggers a workflow run is either pull_request or pull_request_target. 119 - "job": fmt.Sprint(t.JobID), // string, The job_id of the current job. 120 - "ref": ref, // string, The fully-formed ref of the branch or tag that triggered the workflow run. For workflows triggered by push, this is the branch or tag ref that was pushed. For workflows triggered by pull_request, this is the pull request merge branch. For workflows triggered by release, this is the release tag created. For other triggers, this is the branch or tag ref that triggered the workflow run. This is only set if a branch or tag is available for the event type. The ref given is fully-formed, meaning that for branches the format is refs/heads/<branch_name>, for pull requests it is refs/pull/<pr_number>/merge, and for tags it is refs/tags/<tag_name>. For example, refs/heads/feature-branch-1. 121 - "ref_name": refName.ShortName(), // string, The short ref name of the branch or tag that triggered the workflow run. This value matches the branch or tag name shown on GitHub. For example, feature-branch-1. 122 - "ref_protected": false, // boolean, true if branch protections are configured for the ref that triggered the workflow run. 123 - "ref_type": refName.RefType(), // string, The type of ref that triggered the workflow run. Valid values are branch or tag. 124 - "path": "", // string, Path on the runner to the file that sets system PATH variables from workflow commands. This file is unique to the current step and is a different file for each step in a job. For more information, see "Workflow commands for GitHub Actions." 125 - "repository": t.Job.Run.Repo.OwnerName + "/" + t.Job.Run.Repo.Name, // string, The owner and repository name. For example, Codertocat/Hello-World. 126 - "repository_owner": t.Job.Run.Repo.OwnerName, // string, The repository owner's name. For example, Codertocat. 127 - "repositoryUrl": t.Job.Run.Repo.HTMLURL(), // string, The Git URL to the repository. For example, git://github.com/codertocat/hello-world.git. 128 - "retention_days": "", // string, The number of days that workflow run logs and artifacts are kept. 129 - "run_id": fmt.Sprint(t.Job.RunID), // string, A unique number for each workflow run within a repository. This number does not change if you re-run the workflow run. 130 - "run_number": fmt.Sprint(t.Job.Run.Index), // string, A unique number for each run of a particular workflow in a repository. This number begins at 1 for the workflow's first run, and increments with each new run. This number does not change if you re-run the workflow run. 131 - "run_attempt": fmt.Sprint(t.Job.Attempt), // string, A unique number for each attempt of a particular workflow run in a repository. This number begins at 1 for the workflow run's first attempt, and increments with each re-run. 132 - "secret_source": "Actions", // string, The source of a secret used in a workflow. Possible values are None, Actions, Dependabot, or Codespaces. 133 - "server_url": setting.AppURL, // string, The URL of the GitHub server. For example: https://github.com. 134 - "sha": sha, // string, The commit SHA that triggered the workflow. The value of this commit SHA depends on the event that triggered the workflow. For more information, see "Events that trigger workflows." For example, ffac537e6cbbf934b08745a378932722df287a53. 135 - "token": t.Token, // string, A token to authenticate on behalf of the GitHub App installed on your repository. This is functionally equivalent to the GITHUB_TOKEN secret. For more information, see "Automatic token authentication." 136 - "triggering_actor": "", // string, The username of the user that initiated the workflow run. If the workflow run is a re-run, this value may differ from github.actor. Any workflow re-runs will use the privileges of github.actor, even if the actor initiating the re-run (github.triggering_actor) has different privileges. 137 - "workflow": t.Job.Run.WorkflowID, // string, The name of the workflow. If the workflow file doesn't specify a name, the value of this property is the full path of the workflow file in the repository. 138 - "workspace": "", // string, The default working directory on the runner for steps, and the default location of your repository when using the checkout action. 67 + gitCtx := actions.GenerateGiteaContext(t.Job.Run, t.Job) 68 + gitCtx["token"] = t.Token 69 + gitCtx["gitea_runtime_token"] = giteaRuntimeToken 139 70 140 - // additional contexts 141 - "gitea_default_actions_url": setting.Actions.DefaultActionsURL.URL(), 142 - "gitea_runtime_token": giteaRuntimeToken, 143 - }) 71 + taskContext, err := structpb.NewStruct(gitCtx) 144 72 if err != nil { 145 73 log.Error("structpb.NewStruct failed: %v", err) 146 74 } ··· 150 78 151 79 func findTaskNeeds(ctx context.Context, task *actions_model.ActionTask) (map[string]*runnerv1.TaskNeed, error) { 152 80 if err := task.LoadAttributes(ctx); err != nil { 153 - return nil, fmt.Errorf("LoadAttributes: %w", err) 81 + return nil, fmt.Errorf("task LoadAttributes: %w", err) 154 82 } 155 - if len(task.Job.Needs) == 0 { 156 - return nil, nil 157 - } 158 - needs := container.SetOf(task.Job.Needs...) 159 - 160 - jobs, err := db.Find[actions_model.ActionRunJob](ctx, actions_model.FindRunJobOptions{RunID: task.Job.RunID}) 83 + taskNeeds, err := actions.FindTaskNeeds(ctx, task.Job) 161 84 if err != nil { 162 - return nil, fmt.Errorf("FindRunJobs: %w", err) 85 + return nil, err 163 86 } 164 - 165 - jobIDJobs := make(map[string][]*actions_model.ActionRunJob) 166 - for _, job := range jobs { 167 - jobIDJobs[job.JobID] = append(jobIDJobs[job.JobID], job) 168 - } 169 - 170 - ret := make(map[string]*runnerv1.TaskNeed, len(needs)) 171 - for jobID, jobsWithSameID := range jobIDJobs { 172 - if !needs.Contains(jobID) { 173 - continue 174 - } 175 - var jobOutputs map[string]string 176 - for _, job := range jobsWithSameID { 177 - if job.TaskID == 0 || !job.Status.IsDone() { 178 - // it shouldn't happen, or the job has been rerun 179 - continue 180 - } 181 - got, err := actions_model.FindTaskOutputByTaskID(ctx, job.TaskID) 182 - if err != nil { 183 - return nil, fmt.Errorf("FindTaskOutputByTaskID: %w", err) 184 - } 185 - outputs := make(map[string]string, len(got)) 186 - for _, v := range got { 187 - outputs[v.OutputKey] = v.OutputValue 188 - } 189 - if len(jobOutputs) == 0 { 190 - jobOutputs = outputs 191 - } else { 192 - jobOutputs = mergeTwoOutputs(outputs, jobOutputs) 193 - } 194 - } 87 + ret := make(map[string]*runnerv1.TaskNeed, len(taskNeeds)) 88 + for jobID, taskNeed := range taskNeeds { 195 89 ret[jobID] = &runnerv1.TaskNeed{ 196 - Outputs: jobOutputs, 197 - Result: runnerv1.Result(actions_model.AggregateJobStatus(jobsWithSameID)), 90 + Outputs: taskNeed.Outputs, 91 + Result: runnerv1.Result(taskNeed.Result), 198 92 } 199 93 } 200 - 201 94 return ret, nil 202 95 } 203 - 204 - // mergeTwoOutputs merges two outputs from two different ActionRunJobs 205 - // Values with the same output name may be overridden. The user should ensure the output names are unique. 206 - // See https://docs.github.com/en/actions/writing-workflows/workflow-syntax-for-github-actions#using-job-outputs-in-a-matrix-job 207 - func mergeTwoOutputs(o1, o2 map[string]string) map[string]string { 208 - ret := make(map[string]string, len(o1)) 209 - for k1, v1 := range o1 { 210 - if len(v1) > 0 { 211 - ret[k1] = v1 212 - } else { 213 - ret[k1] = o2[k1] 214 - } 215 - } 216 - return ret 217 - }

+4 -3

routers/api/actions/runner/utils_test.go services/actions/context_test.go

··· 1 1 // Copyright 2024 The Gitea Authors. All rights reserved. 2 2 // SPDX-License-Identifier: MIT 3 3 4 - package runner 4 + package actions 5 5 6 6 import ( 7 7 "context" ··· 14 14 "github.com/stretchr/testify/require" 15 15 ) 16 16 17 - func Test_findTaskNeeds(t *testing.T) { 17 + func TestFindTaskNeeds(t *testing.T) { 18 18 require.NoError(t, unittest.PrepareTestDatabase()) 19 19 20 20 task := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionTask{ID: 51}) 21 + job := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{ID: task.JobID}) 21 22 22 - ret, err := findTaskNeeds(context.Background(), task) 23 + ret, err := FindTaskNeeds(context.Background(), job) 23 24 require.NoError(t, err) 24 25 assert.Len(t, ret, 1) 25 26 assert.Contains(t, ret, "job1")

+161

services/actions/context.go

··· 1 + // Copyright 2025 The Gitea Authors. All rights reserved. 2 + // SPDX-License-Identifier: MIT 3 + 4 + package actions 5 + 6 + import ( 7 + "context" 8 + "fmt" 9 + 10 + actions_model "code.gitea.io/gitea/models/actions" 11 + "code.gitea.io/gitea/models/db" 12 + actions_module "code.gitea.io/gitea/modules/actions" 13 + "code.gitea.io/gitea/modules/container" 14 + "code.gitea.io/gitea/modules/git" 15 + "code.gitea.io/gitea/modules/json" 16 + "code.gitea.io/gitea/modules/setting" 17 + ) 18 + 19 + // GenerateGiteaContext generate the gitea context without token and gitea_runtime_token 20 + // job can be nil when generating a context for parsing workflow-level expressions 21 + func GenerateGiteaContext(run *actions_model.ActionRun, job *actions_model.ActionRunJob) map[string]any { 22 + event := map[string]any{} 23 + _ = json.Unmarshal([]byte(run.EventPayload), &event) 24 + 25 + baseRef := "" 26 + headRef := "" 27 + ref := run.Ref 28 + sha := run.CommitSHA 29 + if pullPayload, err := run.GetPullRequestEventPayload(); err == nil && pullPayload.PullRequest != nil && pullPayload.PullRequest.Base != nil && pullPayload.PullRequest.Head != nil { 30 + baseRef = pullPayload.PullRequest.Base.Ref 31 + headRef = pullPayload.PullRequest.Head.Ref 32 + 33 + // if the TriggerEvent is pull_request_target, ref and sha need to be set according to the base of pull request 34 + // In GitHub's documentation, ref should be the branch or tag that triggered workflow. But when the TriggerEvent is pull_request_target, 35 + // the ref will be the base branch. 36 + if run.TriggerEvent == actions_module.GithubEventPullRequestTarget { 37 + ref = git.BranchPrefix + pullPayload.PullRequest.Base.Name 38 + sha = pullPayload.PullRequest.Base.Sha 39 + } 40 + } 41 + 42 + refName := git.RefName(ref) 43 + 44 + gitContext := map[string]any{ 45 + // standard contexts, see https://docs.github.com/en/actions/learn-github-actions/contexts#github-context 46 + "action": "", // string, The name of the action currently running, or the id of a step. GitHub removes special characters, and uses the name __run when the current step runs a script without an id. If you use the same action more than once in the same job, the name will include a suffix with the sequence number with underscore before it. For example, the first script you run will have the name __run, and the second script will be named __run_2. Similarly, the second invocation of actions/checkout will be actionscheckout2. 47 + "action_path": "", // string, The path where an action is located. This property is only supported in composite actions. You can use this path to access files located in the same repository as the action. 48 + "action_ref": "", // string, For a step executing an action, this is the ref of the action being executed. For example, v2. 49 + "action_repository": "", // string, For a step executing an action, this is the owner and repository name of the action. For example, actions/checkout. 50 + "action_status": "", // string, For a composite action, the current result of the composite action. 51 + "actor": run.TriggerUser.Name, // string, The username of the user that triggered the initial workflow run. If the workflow run is a re-run, this value may differ from github.triggering_actor. Any workflow re-runs will use the privileges of github.actor, even if the actor initiating the re-run (github.triggering_actor) has different privileges. 52 + "api_url": setting.AppURL + "api/v1", // string, The URL of the GitHub REST API. 53 + "base_ref": baseRef, // string, The base_ref or target branch of the pull request in a workflow run. This property is only available when the event that triggers a workflow run is either pull_request or pull_request_target. 54 + "env": "", // string, Path on the runner to the file that sets environment variables from workflow commands. This file is unique to the current step and is a different file for each step in a job. For more information, see "Workflow commands for GitHub Actions." 55 + "event": event, // object, The full event webhook payload. You can access individual properties of the event using this context. This object is identical to the webhook payload of the event that triggered the workflow run, and is different for each event. The webhooks for each GitHub Actions event is linked in "Events that trigger workflows." For example, for a workflow run triggered by the push event, this object contains the contents of the push webhook payload. 56 + "event_name": run.TriggerEvent, // string, The name of the event that triggered the workflow run. 57 + "event_path": "", // string, The path to the file on the runner that contains the full event webhook payload. 58 + "graphql_url": "", // string, The URL of the GitHub GraphQL API. 59 + "head_ref": headRef, // string, The head_ref or source branch of the pull request in a workflow run. This property is only available when the event that triggers a workflow run is either pull_request or pull_request_target. 60 + "job": "", // string, The job_id of the current job. 61 + "ref": ref, // string, The fully-formed ref of the branch or tag that triggered the workflow run. For workflows triggered by push, this is the branch or tag ref that was pushed. For workflows triggered by pull_request, this is the pull request merge branch. For workflows triggered by release, this is the release tag created. For other triggers, this is the branch or tag ref that triggered the workflow run. This is only set if a branch or tag is available for the event type. The ref given is fully-formed, meaning that for branches the format is refs/heads/<branch_name>, for pull requests it is refs/pull/<pr_number>/merge, and for tags it is refs/tags/<tag_name>. For example, refs/heads/feature-branch-1. 62 + "ref_name": refName.ShortName(), // string, The short ref name of the branch or tag that triggered the workflow run. This value matches the branch or tag name shown on GitHub. For example, feature-branch-1. 63 + "ref_protected": false, // boolean, true if branch protections are configured for the ref that triggered the workflow run. 64 + "ref_type": refName.RefType(), // string, The type of ref that triggered the workflow run. Valid values are branch or tag. 65 + "path": "", // string, Path on the runner to the file that sets system PATH variables from workflow commands. This file is unique to the current step and is a different file for each step in a job. For more information, see "Workflow commands for GitHub Actions." 66 + "repository": run.Repo.OwnerName + "/" + run.Repo.Name, // string, The owner and repository name. For example, Codertocat/Hello-World. 67 + "repository_owner": run.Repo.OwnerName, // string, The repository owner's name. For example, Codertocat. 68 + "repositoryUrl": run.Repo.HTMLURL(), // string, The Git URL to the repository. For example, git://github.com/codertocat/hello-world.git. 69 + "retention_days": "", // string, The number of days that workflow run logs and artifacts are kept. 70 + "run_id": "", // string, A unique number for each workflow run within a repository. This number does not change if you re-run the workflow run. 71 + "run_number": fmt.Sprint(run.Index), // string, A unique number for each run of a particular workflow in a repository. This number begins at 1 for the workflow's first run, and increments with each new run. This number does not change if you re-run the workflow run. 72 + "run_attempt": "", // string, A unique number for each attempt of a particular workflow run in a repository. This number begins at 1 for the workflow run's first attempt, and increments with each re-run. 73 + "secret_source": "Actions", // string, The source of a secret used in a workflow. Possible values are None, Actions, Dependabot, or Codespaces. 74 + "server_url": setting.AppURL, // string, The URL of the GitHub server. For example: https://github.com. 75 + "sha": sha, // string, The commit SHA that triggered the workflow. The value of this commit SHA depends on the event that triggered the workflow. For more information, see "Events that trigger workflows." For example, ffac537e6cbbf934b08745a378932722df287a53. 76 + "triggering_actor": "", // string, The username of the user that initiated the workflow run. If the workflow run is a re-run, this value may differ from github.actor. Any workflow re-runs will use the privileges of github.actor, even if the actor initiating the re-run (github.triggering_actor) has different privileges. 77 + "workflow": run.WorkflowID, // string, The name of the workflow. If the workflow file doesn't specify a name, the value of this property is the full path of the workflow file in the repository. 78 + "workspace": "", // string, The default working directory on the runner for steps, and the default location of your repository when using the checkout action. 79 + 80 + // additional contexts 81 + "gitea_default_actions_url": setting.Actions.DefaultActionsURL.URL(), 82 + } 83 + 84 + if job != nil { 85 + gitContext["job"] = job.JobID 86 + gitContext["run_id"] = fmt.Sprint(job.RunID) 87 + gitContext["run_attempt"] = fmt.Sprint(job.Attempt) 88 + } 89 + 90 + return gitContext 91 + } 92 + 93 + type TaskNeed struct { 94 + Result actions_model.Status 95 + Outputs map[string]string 96 + } 97 + 98 + // FindTaskNeeds finds the `needs` for the task by the task's job 99 + func FindTaskNeeds(ctx context.Context, job *actions_model.ActionRunJob) (map[string]*TaskNeed, error) { 100 + if len(job.Needs) == 0 { 101 + return nil, nil 102 + } 103 + needs := container.SetOf(job.Needs...) 104 + 105 + jobs, err := db.Find[actions_model.ActionRunJob](ctx, actions_model.FindRunJobOptions{RunID: job.RunID}) 106 + if err != nil { 107 + return nil, fmt.Errorf("FindRunJobs: %w", err) 108 + } 109 + 110 + jobIDJobs := make(map[string][]*actions_model.ActionRunJob) 111 + for _, job := range jobs { 112 + jobIDJobs[job.JobID] = append(jobIDJobs[job.JobID], job) 113 + } 114 + 115 + ret := make(map[string]*TaskNeed, len(needs)) 116 + for jobID, jobsWithSameID := range jobIDJobs { 117 + if !needs.Contains(jobID) { 118 + continue 119 + } 120 + var jobOutputs map[string]string 121 + for _, job := range jobsWithSameID { 122 + if job.TaskID == 0 || !job.Status.IsDone() { 123 + // it shouldn't happen, or the job has been rerun 124 + continue 125 + } 126 + got, err := actions_model.FindTaskOutputByTaskID(ctx, job.TaskID) 127 + if err != nil { 128 + return nil, fmt.Errorf("FindTaskOutputByTaskID: %w", err) 129 + } 130 + outputs := make(map[string]string, len(got)) 131 + for _, v := range got { 132 + outputs[v.OutputKey] = v.OutputValue 133 + } 134 + if len(jobOutputs) == 0 { 135 + jobOutputs = outputs 136 + } else { 137 + jobOutputs = mergeTwoOutputs(outputs, jobOutputs) 138 + } 139 + } 140 + ret[jobID] = &TaskNeed{ 141 + Outputs: jobOutputs, 142 + Result: actions_model.AggregateJobStatus(jobsWithSameID), 143 + } 144 + } 145 + return ret, nil 146 + } 147 + 148 + // mergeTwoOutputs merges two outputs from two different ActionRunJobs 149 + // Values with the same output name may be overridden. The user should ensure the output names are unique. 150 + // See https://docs.github.com/en/actions/writing-workflows/workflow-syntax-for-github-actions#using-job-outputs-in-a-matrix-job 151 + func mergeTwoOutputs(o1, o2 map[string]string) map[string]string { 152 + ret := make(map[string]string, len(o1)) 153 + for k1, v1 := range o1 { 154 + if len(v1) > 0 { 155 + ret[k1] = v1 156 + } else { 157 + ret[k1] = o2[k1] 158 + } 159 + } 160 + return ret 161 + }

+4 -2

services/gitdiff/gitdiff.go

··· 1117 1117 } else { 1118 1118 actualBeforeCommitID := opts.BeforeCommitID 1119 1119 if len(actualBeforeCommitID) == 0 { 1120 - parentCommit, _ := commit.Parent(0) 1120 + parentCommit, err := commit.Parent(0) 1121 + if err != nil { 1122 + return nil, err 1123 + } 1121 1124 actualBeforeCommitID = parentCommit.ID.String() 1122 1125 } 1123 1126 ··· 1126 1129 AddDynamicArguments(actualBeforeCommitID, opts.AfterCommitID) 1127 1130 opts.BeforeCommitID = actualBeforeCommitID 1128 1131 1129 - var err error 1130 1132 beforeCommit, err = gitRepo.GetCommit(opts.BeforeCommitID) 1131 1133 if err != nil { 1132 1134 return nil, err

+14 -2

services/mirror/mirror_pull.go

··· 96 96 /* 97 97 // * [new tag] v0.1.8 -> v0.1.8 98 98 // * [new branch] master -> origin/master 99 + // * [new ref] refs/pull/2/head -> refs/pull/2/head" 99 100 // - [deleted] (none) -> origin/test // delete a branch 100 101 // - [deleted] (none) -> 1 // delete a tag 101 102 // 957a993..a87ba5f test -> origin/test ··· 124 125 refName = strings.TrimPrefix(refName, remoteName+"/") 125 126 results = append(results, &mirrorSyncResult{ 126 127 refName: git.RefNameFromBranch(refName), 128 + oldCommitID: gitShortEmptySha, 129 + }) 130 + case strings.HasPrefix(lines[i], " * [new ref]"): // new reference 131 + results = append(results, &mirrorSyncResult{ 132 + refName: git.RefName(refName), 127 133 oldCommitID: gitShortEmptySha, 128 134 }) 129 135 case strings.HasPrefix(lines[i], " - "): // Delete reference ··· 168 174 log.Error("Expect two SHAs but not what found: %q", lines[i]) 169 175 continue 170 176 } 177 + var refFullName git.RefName 178 + if strings.HasPrefix(refName, "refs/") { 179 + refFullName = git.RefName(refName) 180 + } else { 181 + refFullName = git.RefNameFromBranch(strings.TrimPrefix(refName, remoteName+"/")) 182 + } 183 + 171 184 results = append(results, &mirrorSyncResult{ 172 - refName: git.RefNameFromBranch(strings.TrimPrefix(refName, remoteName+"/")), 185 + refName: refFullName, 173 186 oldCommitID: shas[0], 174 187 newCommitID: shas[1], 175 188 }) 176 189 177 - case strings.HasPrefix(lines[i], " * [new ref]"): // new reference - nothing to do 178 190 default: 179 191 log.Warn("parseRemoteUpdateOutput: unexpected update line %q", lines[i]) 180 192 }

+9 -1

services/mirror/mirror_test.go

··· 21 21 * [new ref] refs/pull/516/head -> refs/pull/516/head 22 22 ` 23 23 results := parseRemoteUpdateOutput(output, "origin") 24 - assert.Len(t, results, 6) 24 + assert.Len(t, results, 8) 25 25 assert.EqualValues(t, "refs/tags/v0.1.8", results[0].refName.String()) 26 26 assert.EqualValues(t, gitShortEmptySha, results[0].oldCommitID) 27 27 assert.EqualValues(t, "", results[0].newCommitID) ··· 45 45 assert.EqualValues(t, "refs/heads/test3", results[5].refName.String()) 46 46 assert.EqualValues(t, "957a993", results[5].oldCommitID) 47 47 assert.EqualValues(t, "a87ba5f", results[5].newCommitID) 48 + 49 + assert.EqualValues(t, "refs/pull/27/merge", results[6].refName.String()) 50 + assert.EqualValues(t, gitShortEmptySha, results[6].oldCommitID) 51 + assert.EqualValues(t, "", results[6].newCommitID) 52 + 53 + assert.EqualValues(t, "refs/pull/516/head", results[7].refName.String()) 54 + assert.EqualValues(t, gitShortEmptySha, results[7].oldCommitID) 55 + assert.EqualValues(t, "", results[7].newCommitID) 48 56 }

+95

tests/integration/actions_job_test.go

··· 4 4 package integration 5 5 6 6 import ( 7 + "context" 7 8 "encoding/base64" 8 9 "fmt" 9 10 "net/http" 10 11 "net/url" 12 + "reflect" 11 13 "testing" 12 14 "time" 13 15 14 16 actions_model "code.gitea.io/gitea/models/actions" 15 17 auth_model "code.gitea.io/gitea/models/auth" 18 + repo_model "code.gitea.io/gitea/models/repo" 16 19 "code.gitea.io/gitea/models/unittest" 17 20 user_model "code.gitea.io/gitea/models/user" 21 + "code.gitea.io/gitea/modules/git" 22 + "code.gitea.io/gitea/modules/json" 18 23 "code.gitea.io/gitea/modules/setting" 19 24 api "code.gitea.io/gitea/modules/structs" 20 25 21 26 runnerv1 "code.gitea.io/actions-proto-go/runner/v1" 22 27 "github.com/stretchr/testify/assert" 28 + "github.com/stretchr/testify/require" 23 29 ) 24 30 25 31 func TestJobWithNeeds(t *testing.T) { ··· 351 357 352 358 httpContext := NewAPITestContext(t, user2.Name, apiRepo.Name, auth_model.AccessTokenScopeWriteRepository) 353 359 doAPIDeleteRepository(httpContext)(t) 360 + }) 361 + } 362 + 363 + func TestActionsGiteaContext(t *testing.T) { 364 + if !setting.Database.Type.IsSQLite3() { 365 + t.Skip() 366 + } 367 + 368 + onGiteaRun(t, func(t *testing.T, u *url.URL) { 369 + user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) 370 + user2Session := loginUser(t, user2.Name) 371 + user2Token := getTokenForLoggedInUser(t, user2Session, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) 372 + 373 + apiBaseRepo := createActionsTestRepo(t, user2Token, "actions-gitea-context", false) 374 + baseRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: apiBaseRepo.ID}) 375 + user2APICtx := NewAPITestContext(t, baseRepo.OwnerName, baseRepo.Name, auth_model.AccessTokenScopeWriteRepository) 376 + 377 + runner := newMockRunner() 378 + runner.registerAsRepoRunner(t, baseRepo.OwnerName, baseRepo.Name, "mock-runner", []string{"ubuntu-latest"}) 379 + 380 + // init the workflow 381 + wfTreePath := ".gitea/workflows/pull.yml" 382 + wfFileContent := `name: Pull Request 383 + on: pull_request 384 + jobs: 385 + wf1-job: 386 + runs-on: ubuntu-latest 387 + steps: 388 + - run: echo 'test the pull' 389 + ` 390 + opts := getWorkflowCreateFileOptions(user2, baseRepo.DefaultBranch, fmt.Sprintf("create %s", wfTreePath), wfFileContent) 391 + createWorkflowFile(t, user2Token, baseRepo.OwnerName, baseRepo.Name, wfTreePath, opts) 392 + // user2 creates a pull request 393 + doAPICreateFile(user2APICtx, "user2-patch.txt", &api.CreateFileOptions{ 394 + FileOptions: api.FileOptions{ 395 + NewBranchName: "user2/patch-1", 396 + Message: "create user2-patch.txt", 397 + Author: api.Identity{ 398 + Name: user2.Name, 399 + Email: user2.Email, 400 + }, 401 + Committer: api.Identity{ 402 + Name: user2.Name, 403 + Email: user2.Email, 404 + }, 405 + Dates: api.CommitDateOptions{ 406 + Author: time.Now(), 407 + Committer: time.Now(), 408 + }, 409 + }, 410 + ContentBase64: base64.StdEncoding.EncodeToString([]byte("user2-fix")), 411 + })(t) 412 + apiPull, err := doAPICreatePullRequest(user2APICtx, baseRepo.OwnerName, baseRepo.Name, baseRepo.DefaultBranch, "user2/patch-1")(t) 413 + require.NoError(t, err) 414 + task := runner.fetchTask(t) 415 + gtCtx := task.Context.GetFields() 416 + actionTask := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionTask{ID: task.Id}) 417 + actionRunJob := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{ID: actionTask.JobID}) 418 + actionRun := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{ID: actionRunJob.RunID}) 419 + require.NoError(t, actionRun.LoadAttributes(context.Background())) 420 + 421 + assert.Equal(t, user2.Name, gtCtx["actor"].GetStringValue()) 422 + assert.Equal(t, setting.AppURL+"api/v1", gtCtx["api_url"].GetStringValue()) 423 + assert.Equal(t, apiPull.Base.Ref, gtCtx["base_ref"].GetStringValue()) 424 + runEvent := map[string]any{} 425 + require.NoError(t, json.Unmarshal([]byte(actionRun.EventPayload), &runEvent)) 426 + assert.True(t, reflect.DeepEqual(gtCtx["event"].GetStructValue().AsMap(), runEvent)) 427 + assert.Equal(t, actionRun.TriggerEvent, gtCtx["event_name"].GetStringValue()) 428 + assert.Equal(t, apiPull.Head.Ref, gtCtx["head_ref"].GetStringValue()) 429 + assert.Equal(t, actionRunJob.JobID, gtCtx["job"].GetStringValue()) 430 + assert.Equal(t, actionRun.Ref, gtCtx["ref"].GetStringValue()) 431 + assert.Equal(t, (git.RefName(actionRun.Ref)).ShortName(), gtCtx["ref_name"].GetStringValue()) 432 + assert.False(t, gtCtx["ref_protected"].GetBoolValue()) 433 + assert.Equal(t, (git.RefName(actionRun.Ref)).RefType(), gtCtx["ref_type"].GetStringValue()) 434 + assert.Equal(t, actionRun.Repo.OwnerName+"/"+actionRun.Repo.Name, gtCtx["repository"].GetStringValue()) 435 + assert.Equal(t, actionRun.Repo.OwnerName, gtCtx["repository_owner"].GetStringValue()) 436 + assert.Equal(t, actionRun.Repo.HTMLURL(), gtCtx["repositoryUrl"].GetStringValue()) 437 + assert.Equal(t, fmt.Sprint(actionRunJob.RunID), gtCtx["run_id"].GetStringValue()) 438 + assert.Equal(t, fmt.Sprint(actionRun.Index), gtCtx["run_number"].GetStringValue()) 439 + assert.Equal(t, fmt.Sprint(actionRunJob.Attempt), gtCtx["run_attempt"].GetStringValue()) 440 + assert.Equal(t, "Actions", gtCtx["secret_source"].GetStringValue()) 441 + assert.Equal(t, setting.AppURL, gtCtx["server_url"].GetStringValue()) 442 + assert.Equal(t, actionRun.CommitSHA, gtCtx["sha"].GetStringValue()) 443 + assert.Equal(t, actionRun.WorkflowID, gtCtx["workflow"].GetStringValue()) 444 + assert.Equal(t, setting.Actions.DefaultActionsURL.URL(), gtCtx["gitea_default_actions_url"].GetStringValue()) 445 + token := gtCtx["token"].GetStringValue() 446 + assert.Equal(t, actionTask.TokenLastEight, token[len(token)-8:]) 447 + 448 + doAPIDeleteRepository(user2APICtx)(t) 354 449 }) 355 450 } 356 451

Configure Feed

Configure Feed