mirror of
https://gitea.com/gitea/runner.git
synced 2026-11-13 11:23:42 +00:00
Use artifacts v4 jwt if available (#471)
Needs https://github.com/go-gitea/gitea/pull/28885 to provide jwt if sent by server Could fix #459, but that has not been verified. Co-authored-by: Lunny Xiao <[email protected]> Reviewed-on: https://gitea.com/gitea/act_runner/pulls/471 Reviewed-by: delvh <[email protected]> Reviewed-by: Lunny Xiao <[email protected]> Co-authored-by: Christopher Homberger <[email protected]> Co-committed-by: Christopher Homberger <[email protected]>
This commit is contained in:
1 parent
f1f9142a3c
commit
e6630e2e36
2 files changed
+9
-2
No files matched your search
@@ -162,8 +162,12 @@ func (r *Runner) run(ctx context.Context, task *runnerv1.Task, reporter *report.
|
|||||||
preset.Token = t
|
preset.Token = t
|
||||||
}
|
}
|
||||||
|
|
||||||
// use task token to action api token
|
giteaRuntimeToken := taskContext["gitea_runtime_token"].GetStringValue()
|
||||||
r.envs["ACTIONS_RUNTIME_TOKEN"] = preset.Token
|
if giteaRuntimeToken == "" {
|
||||||
|
// use task token to action api token for previous Gitea Server Versions
|
||||||
|
giteaRuntimeToken = preset.Token
|
||||||
|
}
|
||||||
|
r.envs["ACTIONS_RUNTIME_TOKEN"] = giteaRuntimeToken
|
||||||
|
|
||||||
eventJSON, err := json.Marshal(preset.Event)
|
eventJSON, err := json.Marshal(preset.Event)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@@ -47,6 +47,9 @@ func NewReporter(ctx context.Context, cancel context.CancelFunc, client client.C
|
|||||||
if v := task.Context.Fields["token"].GetStringValue(); v != "" {
|
if v := task.Context.Fields["token"].GetStringValue(); v != "" {
|
||||||
oldnew = append(oldnew, v, "***")
|
oldnew = append(oldnew, v, "***")
|
||||||
}
|
}
|
||||||
|
if v := task.Context.Fields["gitea_runtime_token"].GetStringValue(); v != "" {
|
||||||
|
oldnew = append(oldnew, v, "***")
|
||||||
|
}
|
||||||
for _, v := range task.Secrets {
|
for _, v := range task.Secrets {
|
||||||
oldnew = append(oldnew, v, "***")
|
oldnew = append(oldnew, v, "***")
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user