diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index f98652e5..625f3ba6 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -24,7 +24,7 @@ jobs: check-latest: true - name: prepare anonymous docker config run: mkdir -p "$DOCKER_CONFIG" && echo '{}' > "$DOCKER_CONFIG/config.json" - # Pre-pull act/runner's two largest base images so a slow pull can't dominate `make test`; + # Pre-pull internal/act/runner's two largest base images so a slow pull can't dominate `make test`; # the rest (alpine/ubuntu) pull on demand, absorbed by the make-test -timeout. The host # daemon retains them between runs, so this is usually a fast manifest re-check. - name: pre-pull test images @@ -48,4 +48,4 @@ jobs: - name: coverage report run: | make coverage-report - cat .tmp/coverage.md >> "$GITHUB_STEP_SUMMARY" \ No newline at end of file + cat .tmp/coverage.md >> "$GITHUB_STEP_SUMMARY" diff --git a/.gitignore b/.gitignore index 29a82272..388e659f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ /gitea-runner .env -!/act/runner/testdata/secrets/.env +!/internal/act/runner/testdata/secrets/.env .runner .runner.lock coverage.txt @@ -14,4 +14,4 @@ coverage.txt __debug_bin # gorelease binary folder /dist -.DS_Store \ No newline at end of file +.DS_Store diff --git a/internal/act/runner/action_cache_test.go b/internal/act/runner/action_cache_test.go index 6a989214..69ed2558 100644 --- a/internal/act/runner/action_cache_test.go +++ b/internal/act/runner/action_cache_test.go @@ -31,7 +31,7 @@ func runGit(t *testing.T, dir string, args ...string) { } cmd := exec.Command("git", args...) // Fixed identity and host-config isolation so commits succeed offline regardless of the - // host's git config (mirrors gitCmd in act/common/git). + // host's git config (mirrors gitCmd in internal/act/common/git). cmd.Env = append(os.Environ(), "GIT_AUTHOR_NAME=test", "GIT_AUTHOR_EMAIL=test@example.com", "GIT_COMMITTER_NAME=test", "GIT_COMMITTER_EMAIL=test@example.com", diff --git a/internal/app/run/runner.go b/internal/app/run/runner.go index 25f05777..fa99e1b2 100644 --- a/internal/app/run/runner.go +++ b/internal/app/run/runner.go @@ -216,7 +216,7 @@ func isTaskIDDir(name string) bool { // isHostScratchDir reports whether name is a per-job host-mode scratch dir: // hex.EncodeToString of 8 random bytes, i.e. exactly 16 lowercase hex chars -// (see startHostEnvironment in act/runner/run_context.go). The narrow match +// (see startHostEnvironment in internal/act/runner/run_context.go). The narrow match // leaves the sibling shared "tool_cache" dir and any operator data untouched. func isHostScratchDir(name string) bool { if len(name) != 16 { @@ -557,7 +557,7 @@ func (r *Runner) run(ctx context.Context, task *runnerv1.Task, reporter *report. } // patchToolkit reports whether act should edit the toolkit bundled into an action. It follows the -// cache URL, because that is what the edits point the client at; see act/runner/toolkit_patch.go. +// cache URL, because that is what the edits point the client at; see internal/act/runner/toolkit_patch.go. func (r *Runner) patchToolkit() bool { return r.envs["ACTIONS_CACHE_URL"] != "" && (r.cfg.Cache.V2 == nil || *r.cfg.Cache.V2) } diff --git a/scripts/test-dind.sh b/scripts/test-dind.sh index 63387102..abd76127 100755 --- a/scripts/test-dind.sh +++ b/scripts/test-dind.sh @@ -25,7 +25,7 @@ case "${1:-}" in dind|dind-rootless) target="$1"; shift ;; esac [ "${1:-}" = "--" ] && shift -[ $# -eq 0 ] && set -- -race -run '^TestDocker$|^TestDockerCopyToSymlinkPath$' ./act/container/ +[ $# -eq 0 ] && set -- -race -run '^TestDocker$|^TestDockerCopyToSymlinkPath$' ./internal/act/container/ port="${DIND_TEST_PORT:-32375}" name="gitea-runner-dind-test-$$"