mirror of
https://gitea.com/gitea/runner.git
synced 2026-08-20 19:07:45 +00:00
bircni
6c6a878403
Trigger-time inputs used to be visible in the job log but are no longer shown after the "Set up job" section was reshaped. This restores them as an "Inputs" group listing each provided input and its value, rendered only when the event payload carries inputs.
For a run dispatched with `required=required input`, `with_default=default` and `boolean=true`, the "Set up job" log now shows:
```
gitea-com-gitea-0003(version:v3.0.2)
▸ Runner Information
Task: 268506
Job: test
Repository: gitea/runner
Triggered by event: workflow_dispatch
▸ Inputs
boolean: true
required: required input
with_default: default
▸ Operating System
Ubuntu 24.04.4 LTS
linux/amd64
```
Closes https://gitea.com/gitea/runner/issues/1166
Reviewed-on: https://gitea.com/gitea/runner/pulls/1167
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
102 lines
3.2 KiB
Go
102 lines
3.2 KiB
Go
// Copyright 2026 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package run
|
|
|
|
import (
|
|
"fmt"
|
|
"maps"
|
|
"os"
|
|
"runtime"
|
|
"slices"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"gitea.com/gitea/runner/internal/pkg/report"
|
|
"gitea.com/gitea/runner/internal/pkg/ver"
|
|
|
|
runnerv1 "gitea.dev/actionslib/runner/v1"
|
|
"google.golang.org/protobuf/types/known/structpb"
|
|
)
|
|
|
|
// osReleasePath describes the host distribution on Linux; absent elsewhere, where the platform
|
|
// falls back to the Go runtime alone. A var so tests can point it at a fixture.
|
|
var osReleasePath = "/etc/os-release"
|
|
|
|
// reportSetup opens the job log the way actions/runner opens its "Set up job" step. The action
|
|
// downloads and the closing job name are written later, as the job starts.
|
|
func (r *Runner) reportSetup(reporter *report.Reporter, task *runnerv1.Task) {
|
|
for _, line := range r.setupLines(task) {
|
|
reporter.Logf("%s", line)
|
|
}
|
|
}
|
|
|
|
// setupLines names the runner, then reports what it was asked to run and the host it runs on, each
|
|
// in its own group.
|
|
func (r *Runner) setupLines(task *runnerv1.Task) []string {
|
|
fields := task.Context.Fields
|
|
lines := []string{
|
|
fmt.Sprintf("%s(version:%s)", r.name, ver.Version()),
|
|
"::group::Runner Information",
|
|
}
|
|
if names := r.labels.Names(); len(names) > 0 {
|
|
lines = append(lines, "Runner labels: "+strings.Join(names, ", "))
|
|
}
|
|
lines = append(lines,
|
|
// The task id correlates the job log with the runner's log and the server's task list.
|
|
fmt.Sprintf("Task: %d", task.Id),
|
|
"Job: "+fields["job"].GetStringValue(),
|
|
"Repository: "+fields["repository"].GetStringValue(),
|
|
"Triggered by event: "+fields["event_name"].GetStringValue(),
|
|
"::endgroup::",
|
|
)
|
|
lines = append(lines, inputLines(fields)...)
|
|
lines = append(lines, "::group::Operating System")
|
|
lines = append(lines, osInfo()...)
|
|
return append(lines, "::endgroup::")
|
|
}
|
|
|
|
// inputLines lists the inputs the run was triggered with, as workflow_dispatch and workflow_call
|
|
// carry them in the event payload. Empty when the event has none.
|
|
func inputLines(fields map[string]*structpb.Value) []string {
|
|
inputs := fields["event"].GetStructValue().GetFields()["inputs"].GetStructValue().GetFields()
|
|
if len(inputs) == 0 {
|
|
return nil
|
|
}
|
|
lines := []string{"::group::Inputs"}
|
|
for _, name := range slices.Sorted(maps.Keys(inputs)) {
|
|
lines = append(lines, fmt.Sprintf("%s: %v", name, inputs[name].AsInterface()))
|
|
}
|
|
return append(lines, "::endgroup::")
|
|
}
|
|
|
|
// osInfo describes the host the runner executes on.
|
|
func osInfo() []string {
|
|
lines := make([]string, 0, 2)
|
|
if name := prettyOSName(); name != "" {
|
|
lines = append(lines, name)
|
|
}
|
|
return append(lines, fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH))
|
|
}
|
|
|
|
// prettyOSName reads PRETTY_NAME (e.g. "Ubuntu 24.04.4 LTS") from os-release, or "" when absent.
|
|
func prettyOSName() string {
|
|
data, err := os.ReadFile(osReleasePath)
|
|
if err != nil {
|
|
return ""
|
|
}
|
|
|
|
for line := range strings.SplitSeq(string(data), "\n") {
|
|
key, value, ok := strings.Cut(strings.TrimSpace(line), "=")
|
|
if !ok || key != "PRETTY_NAME" {
|
|
continue
|
|
}
|
|
// Values are shell-quoted, but the quotes are optional.
|
|
if unquoted, err := strconv.Unquote(value); err == nil {
|
|
return unquoted
|
|
}
|
|
return value
|
|
}
|
|
return ""
|
|
}
|