mirror of
https://gitea.com/gitea/runner.git
synced 2026-11-09 08:40:29 +00: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 <[email protected]> Reviewed-on: https://gitea.com/gitea/runner/pulls/1333 Reviewed-by: bircni <[email protected]> Co-authored-by: silverwind <[email protected]>
This commit is contained in:
1 parent
befb1b4bb9
commit
430f7bb2cf
15 files changed
+374
-729
No files matched your search
@@ -59,9 +59,8 @@ func TestJobLog_MirrorsUploadedRows(t *testing.T) {
|
||||
}))
|
||||
}
|
||||
fire("the token is s3cret-value")
|
||||
fire("::add-mask::dyn4mic-value")
|
||||
reporter.AddMask("dyn4mic-value")
|
||||
fire("and dyn4mic-value too")
|
||||
fire("::debug::suppressed unless ACTIONS_STEP_DEBUG")
|
||||
require.NoError(t, reporter.Close(""))
|
||||
|
||||
job := readJobLog(t, reporter.jobLog)
|
||||
@@ -69,8 +68,6 @@ func TestJobLog_MirrorsUploadedRows(t *testing.T) {
|
||||
assert.Contains(t, job, "and *** too")
|
||||
assert.NotContains(t, job, "s3cret-value")
|
||||
assert.NotContains(t, job, "dyn4mic-value")
|
||||
assert.NotContains(t, job, "add-mask", "the row carrying the secret never reaches the log")
|
||||
assert.NotContains(t, job, "suppressed unless", "the file holds only what was sent")
|
||||
assert.NotRegexp(t, `(?m)^\S+Z ?$`, job, "the empty row Gitea needs is not job output")
|
||||
assert.Contains(t, job, "[runner] task 41 finished: failure")
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user