mirror of
https://gitea.com/gitea/act_runner
synced 2026-11-16 10:26:22 +01:00
fix: handle workflow commands like GitHub's runner (#1333)
Commands the runner applies itself, like the `::set-output::` older actions still print, showed up raw in the job log. The reporter also re-parsed every line with one job-wide stop-commands and echo state, while act keeps one command handler per step, stage, composite child and hook, as GitHub does. A `::stop-commands::` left active in one of them kept the reporter suppressed for the others, so their `::add-mask::` values were never registered, and post steps logged command lines twice. - act's command handler decides what reaches the log, as GitHub's runner does: applied commands only under `ACTIONS_STEP_DEBUG` or `::echo::on`, `::stop-commands::` and its resume line shown with long tokens masked - Masks go straight to the reporter, which no longer parses command lines - One parser follows GitHub's rules: leading whitespace, `##[...]` anywhere in a line, registered commands only - Service logs honour only `::add-mask::` --------- Co-authored-by: bircni <bircni@icloud.com> Reviewed-on: https://gitea.com/gitea/runner/pulls/1333 Reviewed-by: bircni <bircni@icloud.com> Co-authored-by: silverwind <me@silverwind.io>
This commit is contained in:
1 parent
befb1b4bb9
commit
430f7bb2cf
15 files changed
+374
-729
No files matched your search
@@ -164,8 +164,12 @@ func (rc *RunContext) markInterrupted(err error) {
|
||||
}
|
||||
}
|
||||
|
||||
func (rc *RunContext) AddMask(mask string) {
|
||||
// AddMask also hands the mask to the job logger's extra handler, which receives records unmasked.
|
||||
func (rc *RunContext) AddMask(ctx context.Context, mask string) {
|
||||
rc.Masks = append(rc.Masks, mask)
|
||||
if masker, ok := common.LoggerHandler(ctx).(interface{ AddMask(string) }); ok {
|
||||
masker.AddMask(mask)
|
||||
}
|
||||
}
|
||||
|
||||
func (rc *RunContext) String() string {
|
||||
@@ -672,7 +676,7 @@ func (rc *RunContext) jobServices(ctx context.Context, networkName string) (map[
|
||||
return nil, fmt.Errorf("failed to parse service %s ports: %w", serviceID, err)
|
||||
}
|
||||
|
||||
serviceLog := common.NewLineWriter(rawLogLine(ctx)) // raw, so a service's output cannot set the job's env, outputs or state
|
||||
serviceLog := common.NewLineWriter(rc.serviceCommandHandler(ctx), rawLogLine(ctx))
|
||||
inputs[serviceID] = &container.NewContainerInput{
|
||||
Name: createContainerName(rc.jobContainerName(), serviceID),
|
||||
Image: spec.Image,
|
||||
@@ -705,6 +709,15 @@ func (rc *RunContext) commandLogWriter(ctx context.Context) io.Writer {
|
||||
return common.NewLineWriter(rc.commandHandler(ctx), rawLogLine(ctx))
|
||||
}
|
||||
|
||||
// withCommandLogWriter runs executor with a command handler of its own on the job environment's output.
|
||||
func (rc *RunContext) withCommandLogWriter(ctx context.Context, executor common.Executor) error {
|
||||
logWriter := rc.commandLogWriter(ctx)
|
||||
oldout, olderr := rc.JobContainer.ReplaceLogWriter(logWriter, logWriter)
|
||||
defer rc.JobContainer.ReplaceLogWriter(oldout, olderr)
|
||||
defer common.FlushWriter(logWriter) // the last line of output may lack its newline
|
||||
return executor(ctx)
|
||||
}
|
||||
|
||||
func rawLogLine(ctx context.Context) common.LineHandler {
|
||||
rawLogger := common.Logger(ctx).With(rawOutputField, true)
|
||||
return func(line string) bool {
|
||||
@@ -853,7 +866,7 @@ func (rc *RunContext) UpdateExtraPath(ctx context.Context, githubEnvPath string)
|
||||
for s.Scan() {
|
||||
line := s.Text()
|
||||
if len(line) > 0 {
|
||||
rc.addPath(ctx, line)
|
||||
rc.addPath(line)
|
||||
}
|
||||
}
|
||||
if err := s.Err(); err != nil {
|
||||
|
||||
Reference in new issue
Block a user