ink/act_runner
1
1
Fork 0
mirror of https://gitea.com/gitea/act_runner.git synced 2025-12-19 04:24:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into offline_mode_support

Browse Source
This commit is contained in:
TKaxv_7S
2024-03-17 03:56:52 +00:00
parent 1e0c58693b 5977042b86
commit dc3e71fe2f
10 changed files with 177 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/pkg/envcheck/docker.go
View File

@@ -27,7 +27,7 @@ func CheckIfDockerRunning(ctx context.Context, configDockerHost string) error {
_, err = cli.Ping(ctx)
if err != nil {
return fmt.Errorf("cannot ping the docker daemon, does it running? %w", err)
return fmt.Errorf("cannot ping the docker daemon, is it running? %w", err)
}
return nil

6
internal/pkg/report/reporter.go
View File

@@ -47,6 +47,9 @@ func NewReporter(ctx context.Context, cancel context.CancelFunc, client client.C
if v := task.Context.Fields["token"].GetStringValue(); v != "" {
oldnew = append(oldnew, v, "***")
}
if v := task.Context.Fields["gitea_runtime_token"].GetStringValue(); v != "" {
oldnew = append(oldnew, v, "***")
}
for _, v := range task.Secrets {
oldnew = append(oldnew, v, "***")
}
@@ -111,6 +114,9 @@ func (r *Reporter) Fire(entry *log.Entry) error {
for _, s := range r.state.Steps {
if s.Result == runnerv1.Result_RESULT_UNSPECIFIED {
s.Result = runnerv1.Result_RESULT_CANCELLED
if jobResult == runnerv1.Result_RESULT_SKIPPED {
s.Result = runnerv1.Result_RESULT_SKIPPED
}
}
}
}