mirror of
https://gitea.com/gitea/runner.git
synced 2026-11-12 19:03:45 +00:00
silverwind
645b17de72
Closes differences from GitHub's runner that common workflows hit:
- `ACTIONS_STEP_DEBUG` set as a repository variable enables debug output as on GitHub, where a secret of the same name still takes precedence. `runner.debug` and `RUNNER_DEBUG` are now also set inside composite actions, which lost the secret.
- `github.env` and `github.path` hold the file-command paths instead of being empty, so `echo "A=1" >> "${{ github.env }}"` works.
- Remote composite actions only get a pre stage when they nest actions. That stage evaluated `with:` before earlier steps ran, so an input like `${{ fromJSON(steps.meta.outputs.json).v }}` failed the job.
- `ports` on a job container are published, they were ignored while service ports worked.
- Dockerfile action build output reaches the job log. It was logged at debug and dropped, so a failing `RUN` showed only the final error.
- Local Docker actions honor their `.dockerignore`, as `docker build` does.
- Cancelling or timing out a host-mode step sends SIGINT, then SIGTERM after 7.5 seconds and SIGKILL after 2.5 more, as GitHub's runner does, so `trap` handlers and shutdown hooks run.
- `.sh` job hooks fall back to `sh` where bash is missing, and `.ps1` hooks to `powershell` where pwsh is missing, as on GitHub.
_Written by Claude (Opus 5.5)._
Reviewed-on: https://gitea.com/gitea/runner/pulls/1413
Reviewed-by: bircni <[email protected]>
Co-authored-by: silverwind <[email protected]>
87 lines
2.4 KiB
Go
87 lines
2.4 KiB
Go
// Copyright 2026 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package process
|
|
|
|
import (
|
|
"os"
|
|
"sync"
|
|
|
|
"golang.org/x/sys/windows"
|
|
)
|
|
|
|
// Killer terminates a started process together with its entire descendant tree
|
|
// via a Windows Job Object.
|
|
//
|
|
// Background: a process (a step or a post-task script) often launches a process
|
|
// tree (a shell that starts a child which in turn spawns further GUI or
|
|
// background processes). The default exec.CommandContext cancellation only kills
|
|
// the direct child, so cancelling left the rest of the tree running. Because
|
|
// those orphans inherited the parent's stdout/stderr pipe, cmd.Wait() also
|
|
// blocked forever and the runner hung.
|
|
//
|
|
// Assigning the process to a Job Object lets us kill the whole tree atomically
|
|
// on cancellation (TerminateJobObject), which also closes the inherited pipe
|
|
// handles so cmd.Wait() can return.
|
|
type Killer struct {
|
|
mu sync.Mutex
|
|
job windows.Handle
|
|
}
|
|
|
|
// NewKiller creates a Job Object and assigns p (an already-started process) to
|
|
// it. Children spawned by p afterwards are automatically part of the job. The
|
|
// job does NOT use JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE, so closing the handle on
|
|
// normal completion does not kill legitimate background processes; the tree is
|
|
// only torn down by an explicit Kill (cancellation).
|
|
func NewKiller(p *os.Process) (*Killer, error) {
|
|
job, err := windows.CreateJobObject(nil, nil)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
h, err := windows.OpenProcess(windows.PROCESS_SET_QUOTA|windows.PROCESS_TERMINATE, false, uint32(p.Pid))
|
|
if err != nil {
|
|
_ = windows.CloseHandle(job)
|
|
return nil, err
|
|
}
|
|
defer func() { _ = windows.CloseHandle(h) }()
|
|
|
|
if err := windows.AssignProcessToJobObject(job, h); err != nil {
|
|
_ = windows.CloseHandle(job)
|
|
return nil, err
|
|
}
|
|
|
|
return &Killer{job: job}, nil
|
|
}
|
|
|
|
// Kill terminates every process currently assigned to the job (the process and
|
|
// all of its descendants).
|
|
func (k *Killer) Kill() error {
|
|
if k == nil {
|
|
return nil
|
|
}
|
|
k.mu.Lock()
|
|
defer k.mu.Unlock()
|
|
if k.job == 0 {
|
|
return nil
|
|
}
|
|
return windows.TerminateJobObject(k.job, 1)
|
|
}
|
|
|
|
func (k *Killer) cancel(_process *os.Process, _graceful bool) error { return k.Kill() }
|
|
|
|
// Close releases the job handle. It does not terminate the processes.
|
|
func (k *Killer) Close() error {
|
|
if k == nil {
|
|
return nil
|
|
}
|
|
k.mu.Lock()
|
|
defer k.mu.Unlock()
|
|
if k.job == 0 {
|
|
return nil
|
|
}
|
|
h := k.job
|
|
k.job = 0
|
|
return windows.CloseHandle(h)
|
|
}
|