actions
/
runner
mirror of https://code.forgejo.org/forgejo/runner
1
0
Fork 0
Code Packages

Merge pull request 'feat: use FORGEJO_TOKEN as runtime token' (#389) from xtex/runner:forgejo-token into main 

Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/389
Reviewed-by: earl-warren <earl-warren@noreply.code.forgejo.org>
pull/391/head
earl-warren 2024-12-14 03:30:03 +00:00
parent e238532feb 3068bebfcb
commit 5a14247c19
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/app/cmd/exec.go
View File

@ -418,7 +418,9 @@ func runExec(ctx context.Context, execArgs *executeArgs) func(cmd *cobra.Command
config.Env["ACT_EXEC"] = "true" config.Env["ACT_EXEC"] = "true"
if t := config.Secrets["GITEA_TOKEN"]; t != "" { if t := config.Secrets["FORGEJO_TOKEN"]; t != "" {
config.Token = t
} else if t := config.Secrets["GITEA_TOKEN"]; t != "" {
config.Token = t config.Token = t
} else if t := config.Secrets["GITHUB_TOKEN"]; t != "" { } else if t := config.Secrets["GITHUB_TOKEN"]; t != "" {
config.Token = t config.Token = t

4
internal/app/run/runner.go
View File

@ -168,7 +168,9 @@ func (r *Runner) run(ctx context.Context, task *runnerv1.Task, reporter *report.
RepositoryOwner: taskContext["repository_owner"].GetStringValue(), RepositoryOwner: taskContext["repository_owner"].GetStringValue(),
RetentionDays: taskContext["retention_days"].GetStringValue(), RetentionDays: taskContext["retention_days"].GetStringValue(),
} }
if t := task.Secrets["GITEA_TOKEN"]; t != "" { if t := task.Secrets["FORGEJO_TOKEN"]; t != "" {
preset.Token = t
} else if t := task.Secrets["GITEA_TOKEN"]; t != "" {
preset.Token = t preset.Token = t
} else if t := task.Secrets["GITHUB_TOKEN"]; t != "" { } else if t := task.Secrets["GITHUB_TOKEN"]; t != "" {
preset.Token = t preset.Token = t