mirror of
https://gitea.com/gitea/runner.git
synced 2026-11-08 08:10:30 +00:00
Lunny Xiaoandbircni
de961b91eb
Add `act/common/logging`: a printf-style `Logger` on a slog-shaped `Handler`, with a logrus-backed handler as the only backend, plus a `logtest` handler for tests. Move the job logger onto it: `common.Logger` returns `*logging.Logger`, the job log formatters and the `Reporter` hook become handlers, and composite step IDs travel in the context. Logging is tightly coupled to logrus types (hooks, formatters, `Entry.Data`). Going through our own interface first lets the remaining call sites move over with unchanged behavior, and lets the backend be swapped for `log/slog` in one place afterwards. The global process logger and its masking formatter stay on logrus for now. Assisted-by: Codet Co-authored-by: bircni <[email protected]> Reviewed-on: https://gitea.com/gitea/runner/pulls/1295 Reviewed-by: bircni <[email protected]>
74 lines
2.2 KiB
Go
74 lines
2.2 KiB
Go
// Copyright 2026 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package runner
|
|
|
|
import (
|
|
"context"
|
|
|
|
"gitea.com/gitea/runner/act/common"
|
|
"gitea.com/gitea/runner/internal/pkg/action"
|
|
"gitea.com/gitea/runner/internal/pkg/action/checkout"
|
|
|
|
"gitea.dev/actionslib/pkg/model"
|
|
)
|
|
|
|
var builtinActions = map[string]func(context.Context, *action.Context) error{
|
|
"checkout": checkout.Main,
|
|
}
|
|
|
|
type stepActionBuiltin struct {
|
|
Step *model.Step
|
|
RunContext *RunContext
|
|
run func(context.Context, *action.Context) error
|
|
env map[string]string
|
|
}
|
|
|
|
func (sab *stepActionBuiltin) pre() common.Executor { return common.NewPipelineExecutor() }
|
|
|
|
func (sab *stepActionBuiltin) main() common.Executor {
|
|
sab.env = map[string]string{}
|
|
return runStepExecutor(sab, stepStageMain, func(ctx context.Context) error {
|
|
if common.Dryrun(ctx) {
|
|
return nil
|
|
}
|
|
|
|
printRunActionHeader(ctx, sab.Step, sab.env, sab.RunContext)
|
|
rawLogger := common.Logger(ctx).With(rawOutputField, true)
|
|
defer rawLogger.Infof("::endgroup::")
|
|
|
|
rc := sab.RunContext
|
|
rc.ApplyExtraPath(ctx, &sab.env)
|
|
return sab.run(ctx, &action.Context{
|
|
Container: rc.JobContainer,
|
|
Github: rc.getGithubContext(ctx),
|
|
Inputs: sab.Step.With,
|
|
HostWorkdir: rc.Config.Workdir,
|
|
Workspace: rc.JobContainer.ToContainerPath(rc.Config.Workdir),
|
|
BindWorkdir: rc.Config.BindWorkdir,
|
|
NoSkipCheckout: rc.Config.NoSkipCheckout,
|
|
UseGitIgnore: rc.Config.UseGitIgnore,
|
|
InsecureSkipTLS: rc.Config.InsecureSkipTLS,
|
|
ClientCertFile: rc.Config.ClientCertFile,
|
|
ClientKeyFile: rc.Config.ClientKeyFile,
|
|
Env: sab.env,
|
|
})
|
|
})
|
|
}
|
|
|
|
func (sab *stepActionBuiltin) post() common.Executor { return common.NewPipelineExecutor() }
|
|
|
|
func (sab *stepActionBuiltin) getRunContext() *RunContext { return sab.RunContext }
|
|
|
|
func (sab *stepActionBuiltin) getGithubContext(ctx context.Context) *model.GithubContext {
|
|
return sab.RunContext.getGithubContext(ctx)
|
|
}
|
|
|
|
func (sab *stepActionBuiltin) getStepModel() *model.Step { return sab.Step }
|
|
|
|
func (sab *stepActionBuiltin) getEnv() *map[string]string { return &sab.env }
|
|
|
|
func (sab *stepActionBuiltin) getIfExpression(_ context.Context, _ stepStage) string {
|
|
return sab.Step.If.Value
|
|
}
|