refactor: remove dead code and consolidate tests (#1335)

Removes dead code and redundant logic and consolidates tests, so there is less to read and maintain. No behavior change.

1. **act/runner**: inline single-use wrappers, compile regexes once instead of per call, embed the trampoline as a string, drop the unused legacy result of `parseActionCommand`
2. **act/container**: `sanitizeConfig` and `mergeContainerConfigs` stop returning the configs they already mutate in place, drop never-set option fields and the unused `user` parameter of `ExecWithCmdLine`
3. **act/common and cache server**: drop the unused `Trace`/`Tracef` loggers and the short SHA of `FindGitRevision`, `RegisterJob` releases through `RevokeJob`
4. **daemon, poller and reporter**: one shutdown wait for both poll modes, drop an unreachable fetch timeout branch, guard the reporter's last report time with its existing lock instead of an atomic
5. **build**: drop unused Makefile and release workflow variables, collapse the goreleaser ignore list to the same build targets
6. **tests**: fold near-duplicate tests into tables with shared setup

Throughout, hand-rolled logic gives way to `cmp.Or`, `strings.Cut`, `slices` and `min`/`max`.

Reviewed-on: https://gitea.com/gitea/runner/pulls/1335
Reviewed-by: bircni <[email protected]>
Co-authored-by: silverwind <[email protected]>

internal/pkg/process/killer_windows_test.go

@@ -5,11 +5,8 @@ package process
 
 import (
 	"fmt"
-	"os"
 	"os/exec"
 	"path/filepath"
-	"strconv"
-	"strings"
 	"testing"
 	"time"
 
@@ -17,7 +14,6 @@ import (
 	"golang.org/x/sys/windows"
 )
 
-// processAlive reports whether pid refers to a still-running process.
 func processAlive(pid int) bool {
 	h, err := windows.OpenProcess(windows.PROCESS_QUERY_LIMITED_INFORMATION, false, uint32(pid))
 	if err != nil {
@@ -28,21 +24,13 @@ func processAlive(pid int) bool {
 	if err := windows.GetExitCodeProcess(h, &code); err != nil {
 		return false
 	}
-	const stillActive = 259 // STILL_ACTIVE
+	const stillActive = 259
 	return code == stillActive
 }
 
-// TestKillerKillsTree verifies that a process assigned to the Job Object is
-// terminated together with a child it spawns afterwards. This mirrors a step or
-// post-task script that launches a child which spawns further processes, where
-// cancelling must take down the whole tree, not just the direct child.
 func TestKillerKillsTree(t *testing.T) {
-	dir := t.TempDir()
-	pidFile := filepath.Join(dir, "child.pid")
+	pidFile := filepath.Join(t.TempDir(), "child.pid")
 
-	// Parent powershell spawns a detached, long-lived child powershell (writing
-	// its PID to a file) and then sleeps. The child is launched AFTER the parent
-	// has been assigned to the job, so it must be captured by the job too.
 	script := fmt.Sprintf(
 		`$c = Start-Process powershell -PassThru -ArgumentList '-NoProfile','-Command','Start-Sleep -Seconds 600'; `+
 			`Set-Content -LiteralPath %q -Value $c.Id; Start-Sleep -Seconds 600`, pidFile)
@@ -54,22 +42,8 @@ func TestKillerKillsTree(t *testing.T) {
 	require.NoError(t, err)
 	defer killer.Close()
 
-	// Wait for the child PID to be reported.
-	var childPID int
-	require.Eventually(t, func() bool {
-		b, e := os.ReadFile(pidFile)
-		if e != nil {
-			return false
-		}
-		s := strings.TrimSpace(string(b))
-		if s == "" {
-			return false
-		}
-		childPID, _ = strconv.Atoi(s)
-		return childPID > 0 && processAlive(childPID)
-	}, 20*time.Second, 200*time.Millisecond, "child process should start")
+	childPID := awaitChildPID(t, pidFile)
 
-	// Killing the job must terminate both the parent and the detached child.
 	require.NoError(t, killer.Kill())
 
 	require.Eventually(t, func() bool {

internal/pkg/process/leftover.go

@@ -8,22 +8,14 @@ import (
 	"strings"
 )
 
-// pathWithin is the OS-agnostic core of dirContainsPath: dir and target must
-// already be cleaned, and fold folds case.
-func pathWithin(dir, target string, fold bool) bool {
-	if dir == "" || target == "" || dir == "." || target == "." {
+func dirContainsPath(dir, target string) bool {
+	dir = strings.ToLower(filepath.Clean(dir))
+	target = strings.ToLower(filepath.Clean(target))
+	if dir == "." || target == "." {
 		return false
 	}
-	if fold {
-		dir = strings.ToLower(dir)
-		target = strings.ToLower(target)
-	}
 	if dir == target {
 		return true
 	}
-	sep := string(filepath.Separator)
-	if !strings.HasSuffix(dir, sep) {
-		dir += sep
-	}
-	return strings.HasPrefix(target, dir)
+	return strings.HasPrefix(target, strings.TrimSuffix(dir, string(filepath.Separator))+string(filepath.Separator))
 }

internal/pkg/process/leftover_test.go

@@ -8,33 +8,31 @@ import (
 	"testing"
 )
 
-func TestPathWithin(t *testing.T) {
+func TestDirContainsPath(t *testing.T) {
 	base := filepath.Join("base", "job1")
 
 	cases := []struct {
 		name   string
 		dir    string
 		target string
-		fold   bool
 		want   bool
 	}{
-		{"same dir", base, base, false, true},
-		{"direct child", base, filepath.Join(base, "app.exe"), false, true},
-		{"deep child", base, filepath.Join(base, "sub", "sub", "app.exe"), false, true},
-		{"parent is not within child", filepath.Join(base, "sub"), base, false, false},
-		{"name-prefix sibling spared", base, filepath.Join("base", "job10", "app.exe"), false, false},
-		{"unrelated", base, filepath.Join("other", "app.exe"), false, false},
-		{"empty dir", "", base, false, false},
-		{"empty target", base, "", false, false},
-		{"dot dir", ".", base, false, false},
-		{"case-sensitive miss", base, filepath.Join("base", "JOB1", "app.exe"), false, false},
-		{"case-insensitive hit", base, filepath.Join("base", "JOB1", "app.exe"), true, true},
+		{"same dir", base, base, true},
+		{"direct child", base, filepath.Join(base, "app.exe"), true},
+		{"deep child", base, filepath.Join(base, "sub", "sub", "app.exe"), true},
+		{"parent is not within child", filepath.Join(base, "sub"), base, false},
+		{"name-prefix sibling spared", base, filepath.Join("base", "job10", "app.exe"), false},
+		{"unrelated", base, filepath.Join("other", "app.exe"), false},
+		{"empty dir", "", base, false},
+		{"empty target", base, "", false},
+		{"dot dir", ".", base, false},
+		{"case-insensitive hit", base, filepath.Join("base", "JOB1", "app.exe"), true},
 	}
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
-			got := pathWithin(filepath.Clean(tc.dir), filepath.Clean(tc.target), tc.fold)
+			got := dirContainsPath(tc.dir, tc.target)
 			if got != tc.want {
-				t.Fatalf("pathWithin(%q, %q, fold=%v) = %v, want %v", tc.dir, tc.target, tc.fold, got, tc.want)
+				t.Fatalf("dirContainsPath(%q, %q) = %v, want %v", tc.dir, tc.target, got, tc.want)
 			}
 		})
 	}

internal/pkg/process/leftover_windows.go

@@ -8,18 +8,11 @@ import (
 	"errors"
 	"fmt"
 	"os"
-	"path/filepath"
 	"unsafe"
 
 	"golang.org/x/sys/windows"
 )
 
-// dirContainsPath reports whether target is dir or lives beneath it,
-// case-insensitively, so a name-prefix sibling (job1 vs job10) is not a match.
-func dirContainsPath(dir, target string) bool {
-	return pathWithin(filepath.Clean(dir), filepath.Clean(target), true)
-}
-
 // KillProcessesWithCWDUnder terminates every process in the runner's session
 // whose cwd is one of dirs or below, catching leftovers the path scan misses
 // (Win32_Process exposes no cwd) that still pin a handle. Best-effort.