From 825c6af07caf4e28398f158117e74077ce19f23a Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 7 Aug 2026 21:40:48 -0700 Subject: [PATCH] refactor: move `act` under `internal` The runner is an application, not a library. `act/model` and `act/exprparser` were the last packages anything outside this repository consumed and they now live in actionslib, so nothing needs the rest of `act` to be importable, and keeping it importable invites the coupling that was just removed. Import paths only, the files are unchanged. Assisted-by: Codet:GPT-5.1-Codex --- {act => internal/act}/LICENSE | 0 {act => internal/act}/artifactcache/doc.go | 0 {act => internal/act}/artifactcache/handler.go | 2 +- {act => internal/act}/artifactcache/handler_test.go | 0 {act => internal/act}/artifactcache/handler_v2.go | 0 .../act}/artifactcache/handler_v2_test.go | 0 {act => internal/act}/artifactcache/model.go | 0 {act => internal/act}/artifactcache/results.go | 0 {act => internal/act}/artifactcache/results_test.go | 0 {act => internal/act}/artifactcache/storage.go | 0 {act => internal/act}/artifacts/server.go | 2 +- {act => internal/act}/artifacts/server_test.go | 0 .../act}/common/context_helpers_test.go | 0 {act => internal/act}/common/dryrun.go | 0 {act => internal/act}/common/executor.go | 0 {act => internal/act}/common/executor_test.go | 0 {act => internal/act}/common/git/git.go | 2 +- {act => internal/act}/common/git/git_test.go | 2 +- {act => internal/act}/common/job_error.go | 0 {act => internal/act}/common/line_writer.go | 0 {act => internal/act}/common/line_writer_test.go | 0 {act => internal/act}/common/logger.go | 0 {act => internal/act}/common/outbound_ip.go | 0 {act => internal/act}/container/DOCKER_LICENSE | 0 {act => internal/act}/container/container_types.go | 2 +- {act => internal/act}/container/docker_auth.go | 2 +- {act => internal/act}/container/docker_build.go | 2 +- {act => internal/act}/container/docker_cli.go | 0 {act => internal/act}/container/docker_cli_test.go | 0 .../act}/container/docker_create_flags.go | 0 .../act}/container/docker_create_flags_test.go | 0 {act => internal/act}/container/docker_images.go | 0 .../act}/container/docker_images_test.go | 0 {act => internal/act}/container/docker_logger.go | 0 {act => internal/act}/container/docker_network.go | 2 +- .../act}/container/docker_network_test.go | 0 {act => internal/act}/container/docker_platform.go | 0 .../act}/container/docker_platform_test.go | 0 {act => internal/act}/container/docker_pull.go | 2 +- {act => internal/act}/container/docker_pull_test.go | 0 {act => internal/act}/container/docker_run.go | 4 ++-- {act => internal/act}/container/docker_run_test.go | 2 +- {act => internal/act}/container/docker_socket.go | 0 .../act}/container/docker_socket_test.go | 0 {act => internal/act}/container/docker_stub.go | 2 +- {act => internal/act}/container/docker_volume.go | 2 +- .../act}/container/executions_environment.go | 0 {act => internal/act}/container/helpers_test.go | 0 {act => internal/act}/container/host_environment.go | 6 +++--- .../act}/container/host_environment_test.go | 2 +- .../linux_container_environment_extensions.go | 0 .../linux_container_environment_extensions_test.go | 0 {act => internal/act}/container/parse_env_file.go | 2 +- .../act}/container/parse_env_file_test.go | 0 {act => internal/act}/container/testdata/Dockerfile | 0 .../testdata/docker-pull-options/config.json | 0 .../act}/container/testdata/scratch/test.txt | 0 {act => internal/act}/container/testdata/utf16.env | Bin .../act}/container/testdata/utf16be.env | Bin {act => internal/act}/container/testdata/utf8.env | 0 {act => internal/act}/container/testdata/valid.env | 0 .../act}/container/testdata/valid.label | 0 {act => internal/act}/container/util.go | 0 .../act}/container/util_openbsd_mips64.go | 0 {act => internal/act}/container/util_plan9.go | 0 {act => internal/act}/container/util_windows.go | 0 .../act}/filecollector/file_collector.go | 0 .../act}/filecollector/file_collector_test.go | 0 {act => internal/act}/ghcontext/github_context.go | 4 ++-- .../act}/ghcontext/github_context_test.go | 0 {act => internal/act}/lookpath/LICENSE | 0 {act => internal/act}/lookpath/env.go | 0 {act => internal/act}/lookpath/error.go | 0 {act => internal/act}/lookpath/lp_js.go | 0 {act => internal/act}/lookpath/lp_plan9.go | 0 {act => internal/act}/lookpath/lp_unix.go | 0 {act => internal/act}/lookpath/lp_unix_test.go | 0 {act => internal/act}/lookpath/lp_windows.go | 0 {act => internal/act}/runner/action.go | 6 +++--- {act => internal/act}/runner/action_cache.go | 0 {act => internal/act}/runner/action_cache_test.go | 2 +- {act => internal/act}/runner/action_composite.go | 2 +- .../act}/runner/action_composite_test.go | 0 {act => internal/act}/runner/action_test.go | 6 +++--- {act => internal/act}/runner/cancellation_test.go | 2 +- {act => internal/act}/runner/command.go | 2 +- {act => internal/act}/runner/command_test.go | 2 +- {act => internal/act}/runner/container_mock_test.go | 4 ++-- {act => internal/act}/runner/expression.go | 4 ++-- {act => internal/act}/runner/expression_test.go | 0 {act => internal/act}/runner/hashfiles/index.js | 0 {act => internal/act}/runner/helpers_test.go | 2 +- {act => internal/act}/runner/job_executor.go | 4 ++-- {act => internal/act}/runner/job_executor_test.go | 4 ++-- {act => internal/act}/runner/job_hooks.go | 4 ++-- {act => internal/act}/runner/job_hooks_test.go | 2 +- .../act}/runner/local_repository_cache.go | 2 +- {act => internal/act}/runner/logger.go | 2 +- {act => internal/act}/runner/logger_test.go | 0 {act => internal/act}/runner/max_parallel_test.go | 0 {act => internal/act}/runner/res/trampoline.js | 0 {act => internal/act}/runner/reusable_workflow.go | 4 ++-- .../act}/runner/reusable_workflow_test.go | 2 +- {act => internal/act}/runner/run_context.go | 6 +++--- {act => internal/act}/runner/run_context_test.go | 4 ++-- {act => internal/act}/runner/runner.go | 4 ++-- {act => internal/act}/runner/runner_test.go | 2 +- {act => internal/act}/runner/step.go | 4 ++-- {act => internal/act}/runner/step_action_local.go | 2 +- .../act}/runner/step_action_local_test.go | 2 +- {act => internal/act}/runner/step_action_remote.go | 4 ++-- .../act}/runner/step_action_remote_test.go | 4 ++-- {act => internal/act}/runner/step_docker.go | 4 ++-- {act => internal/act}/runner/step_docker_test.go | 2 +- {act => internal/act}/runner/step_factory.go | 0 {act => internal/act}/runner/step_factory_test.go | 0 {act => internal/act}/runner/step_run.go | 6 +++--- {act => internal/act}/runner/step_run_print_test.go | 2 +- {act => internal/act}/runner/step_run_test.go | 2 +- {act => internal/act}/runner/step_test.go | 2 +- .../.github/workflows/local-reusable-workflow.yml | 0 .../testdata/GITHUB_ENV-use-in-env-ctx/push.yml | 0 .../act}/runner/testdata/GITHUB_STATE/push.yml | 0 .../act-composite-env-test/action1/action.yml | 0 .../act-composite-env-test/action2/action.yml | 0 .../runner/testdata/act-composite-env-test/push.yml | 0 .../docker/Dockerfile | 0 .../docker/action.yml | 0 .../docker/entrypoint.sh | 0 .../js/action.yml | 0 .../js/index.js | 0 .../actions-environment-and-context-tests/push.yml | 0 .../act}/runner/testdata/actions/action1/Dockerfile | 0 .../act}/runner/testdata/actions/action1/action.yml | 0 .../actions/composite-fail-with-output/action.yml | 0 .../testdata/actions/docker-local-noargs/Dockerfile | 0 .../testdata/actions/docker-local-noargs/action.yml | 0 .../actions/docker-local-noargs/entrypoint.sh | 0 .../runner/testdata/actions/docker-local/Dockerfile | 0 .../runner/testdata/actions/docker-local/action.yml | 0 .../testdata/actions/docker-local/entrypoint.sh | 0 .../runner/testdata/actions/docker-url/action.yml | 0 .../act}/runner/testdata/actions/node24/.gitignore | 0 .../act}/runner/testdata/actions/node24/action.yml | 0 .../act}/runner/testdata/actions/node24/index.js | 0 .../runner/testdata/actions/node24/package.json | 0 .../act}/runner/testdata/actions/script/action.yml | 0 .../act}/runner/testdata/actions/script/index.js | 0 .../runner/testdata/actions/script/package.json | 0 .../act}/runner/testdata/actions/script/post.js | 0 .../act}/runner/testdata/basic/push.yml | 0 .../testdata/cache/nektos-test-override.git/HEAD | 0 .../testdata/cache/nektos-test-override.git/config | 0 .../act}/runner/testdata/checkout/push.yml | 0 .../act}/runner/testdata/commands/push.yml | 0 .../testdata/composite-fail-with-output/push.yml | 0 .../runner/testdata/container-hostname/push.yml | 0 .../act}/runner/testdata/container-volumes/push.yml | 0 .../act}/runner/testdata/defaults-run/main.yaml | 0 .../do-not-leak-step-env-in-composite/push.yml | 0 .../testdata/docker-action-custom-path/push.yml | 0 .../ensure-post-steps/action-composite/action.yml | 0 .../ensure-post-steps/action-post/action.yml | 0 .../testdata/ensure-post-steps/action-post/main.js | 0 .../testdata/ensure-post-steps/action-post/post.js | 0 .../act}/runner/testdata/ensure-post-steps/push.yml | 0 .../act}/runner/testdata/env-and-path/push.yaml | 0 .../testdata/environment-files-parser-bug/push.yaml | 0 .../runner/testdata/environment-files/push.yaml | 0 .../act}/runner/testdata/evalenv/push.yml | 0 .../runner/testdata/evalmatrix-merge-array/push.yml | 0 .../runner/testdata/evalmatrix-merge-map/push.yml | 0 .../act}/runner/testdata/evalmatrix/push.yml | 0 .../act}/runner/testdata/evalmatrixneeds/push.yml | 0 .../act}/runner/testdata/evalmatrixneeds2/push.yml | 0 {act => internal/act}/runner/testdata/fail/push.yml | 0 .../act}/runner/testdata/if-env-act/push.yml | 0 .../act}/runner/testdata/if-expressions/push.yml | 0 .../act}/runner/testdata/input-from-cli/input.yml | 0 .../testdata/inputs-via-env-context/action.yml | 0 .../runner/testdata/inputs-via-env-context/push.yml | 0 .../act}/runner/testdata/issue-1595/missing.yml | 0 .../act}/runner/testdata/issue-1595/no-event.yml | 0 .../act}/runner/testdata/issue-1595/no-first.yml | 0 .../act}/runner/testdata/issue-597/spelling.yaml | 0 .../act}/runner/testdata/issue-598/spelling.yml | 0 .../job-container-invalid-credentials/push.yml | 0 .../runner/testdata/job-container-non-root/push.yml | 0 .../act}/runner/testdata/job-container/push.yml | 0 .../job-needs-context-contains-result/push.yml | 0 .../act}/runner/testdata/job-nil-step/push.yml | 0 .../act}/runner/testdata/job-status-check/push.yml | 0 .../testdata/local-action-docker-url/push.yml | 0 .../testdata/local-action-dockerfile/push.yml | 0 .../act}/runner/testdata/local-action-js/push.yml | 0 .../action.yml | 0 .../local-action-via-composite-dockerfile/push.yml | 0 .../local-remote-action-overrides/config.yml | 0 .../testdata/local-remote-action-overrides/push.yml | 0 .../testdata/mask-values/composite/action.yml | 0 .../act}/runner/testdata/mask-values/push.yml | 0 .../act}/runner/testdata/matrix-exitcode/push.yml | 0 .../testdata/matrix-with-user-inclusions/push.yml | 0 .../act}/runner/testdata/matrix/push.yml | 0 .../act}/runner/testdata/networking/push.yml | 0 .../act}/runner/testdata/nix-prepend-path/push.yml | 0 .../no-panic-on-invalid-composite-action/push.yml | 0 .../runner/testdata/non-existent-action/push.yml | 0 .../act}/runner/testdata/outputs/push.yml | 0 .../act}/runner/testdata/path-handling/action.yml | 0 .../act}/runner/testdata/path-handling/push.yml | 0 .../act}/runner/testdata/pull-request/event.json | 0 .../act}/runner/testdata/pull-request/main.yaml | 0 {act => internal/act}/runner/testdata/secrets/.env | 0 .../act}/runner/testdata/secrets/.secrets | 0 .../act}/runner/testdata/secrets/push.yml | 0 .../runner/testdata/services-empty-image/push.yml | 0 .../testdata/services-with-container/push.yml | 0 .../act}/runner/testdata/services/push.yaml | 0 .../testdata/set-env-new-env-file-per-step/push.yml | 0 .../testdata/set-env-step-env-override/push.yml | 0 .../act}/runner/testdata/shells/bash/push.yml | 0 .../act}/runner/testdata/shells/defaults/push.yml | 0 .../act}/runner/testdata/shells/pwsh/push.yml | 0 .../act}/runner/testdata/shells/sh/push.yml | 0 .../testdata/steps-context/conclusion/push.yml | 0 .../runner/testdata/steps-context/outcome/push.yml | 0 .../testdata/uses-and-run-in-one-step/push.yml | 0 .../composite_action2/action.yml | 0 .../testdata/uses-composite-with-error/push.yml | 0 .../uses-composite/composite_action/action.yml | 0 .../act}/runner/testdata/uses-composite/push.yml | 0 .../act}/runner/testdata/uses-docker-url/push.yml | 0 .../act}/runner/testdata/uses-github-empty/push.yml | 0 .../act}/runner/testdata/uses-github-noref/push.yml | 0 .../act}/runner/testdata/uses-github-root/push.yml | 0 .../act}/runner/testdata/uses-workflow/push.yml | 0 .../act}/runner/testdata/windows-add-env/action.yml | 0 .../act}/runner/testdata/windows-add-env/push.yml | 0 .../runner/testdata/windows-prepend-path/push.yml | 0 .../act}/runner/testdata/windows-shell-cmd/push.yml | 0 .../act}/runner/testdata/workdir/canary | 0 .../act}/runner/testdata/workdir/canary-link | 0 .../act}/runner/testdata/workdir/push.yml | 0 .../runner/testdata/workflow_call_inputs/event.json | 0 .../workflow_call_inputs/workflow_call_inputs.yml | 0 .../workflow_dispatch.yml | 0 .../workflow_dispatch-scalar/workflow_dispatch.yml | 0 .../runner/testdata/workflow_dispatch/event.json | 0 .../workflow_dispatch/workflow_dispatch.yml | 0 .../workflow_dispatch.yml | 0 {act => internal/act}/runner/toolkit_patch.go | 4 ++-- .../act}/runner/toolkit_patch_e2e_test.go | 2 +- {act => internal/act}/runner/toolkit_patch_test.go | 0 internal/app/cmd/cache-server.go | 2 +- internal/app/cmd/exec.go | 8 ++++---- internal/app/run/health_check.go | 2 +- internal/app/run/post_task_script.go | 2 +- internal/app/run/proxy.go | 2 +- internal/app/run/runner.go | 8 ++++---- internal/app/run/runner_cache_test.go | 2 +- internal/app/run/runner_test.go | 2 +- internal/pkg/report/reporter.go | 2 +- internal/pkg/report/reporter_test.go | 2 +- 264 files changed, 93 insertions(+), 93 deletions(-) rename {act => internal/act}/LICENSE (100%) rename {act => internal/act}/artifactcache/doc.go (100%) rename {act => internal/act}/artifactcache/handler.go (99%) rename {act => internal/act}/artifactcache/handler_test.go (100%) rename {act => internal/act}/artifactcache/handler_v2.go (100%) rename {act => internal/act}/artifactcache/handler_v2_test.go (100%) rename {act => internal/act}/artifactcache/model.go (100%) rename {act => internal/act}/artifactcache/results.go (100%) rename {act => internal/act}/artifactcache/results_test.go (100%) rename {act => internal/act}/artifactcache/storage.go (100%) rename {act => internal/act}/artifacts/server.go (99%) rename {act => internal/act}/artifacts/server_test.go (100%) rename {act => internal/act}/common/context_helpers_test.go (100%) rename {act => internal/act}/common/dryrun.go (100%) rename {act => internal/act}/common/executor.go (100%) rename {act => internal/act}/common/executor_test.go (100%) rename {act => internal/act}/common/git/git.go (99%) rename {act => internal/act}/common/git/git_test.go (99%) rename {act => internal/act}/common/job_error.go (100%) rename {act => internal/act}/common/line_writer.go (100%) rename {act => internal/act}/common/line_writer_test.go (100%) rename {act => internal/act}/common/logger.go (100%) rename {act => internal/act}/common/outbound_ip.go (100%) rename {act => internal/act}/container/DOCKER_LICENSE (100%) rename {act => internal/act}/container/container_types.go (98%) rename {act => internal/act}/container/docker_auth.go (97%) rename {act => internal/act}/container/docker_build.go (98%) rename {act => internal/act}/container/docker_cli.go (100%) rename {act => internal/act}/container/docker_cli_test.go (100%) rename {act => internal/act}/container/docker_create_flags.go (100%) rename {act => internal/act}/container/docker_create_flags_test.go (100%) rename {act => internal/act}/container/docker_images.go (100%) rename {act => internal/act}/container/docker_images_test.go (100%) rename {act => internal/act}/container/docker_logger.go (100%) rename {act => internal/act}/container/docker_network.go (99%) rename {act => internal/act}/container/docker_network_test.go (100%) rename {act => internal/act}/container/docker_platform.go (100%) rename {act => internal/act}/container/docker_platform_test.go (100%) rename {act => internal/act}/container/docker_pull.go (98%) rename {act => internal/act}/container/docker_pull_test.go (100%) rename {act => internal/act}/container/docker_run.go (99%) rename {act => internal/act}/container/docker_run_test.go (99%) rename {act => internal/act}/container/docker_socket.go (100%) rename {act => internal/act}/container/docker_socket_test.go (100%) rename {act => internal/act}/container/docker_stub.go (98%) rename {act => internal/act}/container/docker_volume.go (96%) rename {act => internal/act}/container/executions_environment.go (100%) rename {act => internal/act}/container/helpers_test.go (100%) rename {act => internal/act}/container/host_environment.go (99%) rename {act => internal/act}/container/host_environment_test.go (99%) rename {act => internal/act}/container/linux_container_environment_extensions.go (100%) rename {act => internal/act}/container/linux_container_environment_extensions_test.go (100%) rename {act => internal/act}/container/parse_env_file.go (98%) rename {act => internal/act}/container/parse_env_file_test.go (100%) rename {act => internal/act}/container/testdata/Dockerfile (100%) rename {act => internal/act}/container/testdata/docker-pull-options/config.json (100%) rename {act => internal/act}/container/testdata/scratch/test.txt (100%) rename {act => internal/act}/container/testdata/utf16.env (100%) rename {act => internal/act}/container/testdata/utf16be.env (100%) rename {act => internal/act}/container/testdata/utf8.env (100%) rename {act => internal/act}/container/testdata/valid.env (100%) rename {act => internal/act}/container/testdata/valid.label (100%) rename {act => internal/act}/container/util.go (100%) rename {act => internal/act}/container/util_openbsd_mips64.go (100%) rename {act => internal/act}/container/util_plan9.go (100%) rename {act => internal/act}/container/util_windows.go (100%) rename {act => internal/act}/filecollector/file_collector.go (100%) rename {act => internal/act}/filecollector/file_collector_test.go (100%) rename {act => internal/act}/ghcontext/github_context.go (97%) rename {act => internal/act}/ghcontext/github_context_test.go (100%) rename {act => internal/act}/lookpath/LICENSE (100%) rename {act => internal/act}/lookpath/env.go (100%) rename {act => internal/act}/lookpath/error.go (100%) rename {act => internal/act}/lookpath/lp_js.go (100%) rename {act => internal/act}/lookpath/lp_plan9.go (100%) rename {act => internal/act}/lookpath/lp_unix.go (100%) rename {act => internal/act}/lookpath/lp_unix_test.go (100%) rename {act => internal/act}/lookpath/lp_windows.go (100%) rename {act => internal/act}/runner/action.go (99%) rename {act => internal/act}/runner/action_cache.go (100%) rename {act => internal/act}/runner/action_cache_test.go (99%) rename {act => internal/act}/runner/action_composite.go (99%) rename {act => internal/act}/runner/action_composite_test.go (100%) rename {act => internal/act}/runner/action_test.go (99%) rename {act => internal/act}/runner/cancellation_test.go (99%) rename {act => internal/act}/runner/command.go (99%) rename {act => internal/act}/runner/command_test.go (99%) rename {act => internal/act}/runner/container_mock_test.go (96%) rename {act => internal/act}/runner/expression.go (99%) rename {act => internal/act}/runner/expression_test.go (100%) rename {act => internal/act}/runner/hashfiles/index.js (100%) rename {act => internal/act}/runner/helpers_test.go (97%) rename {act => internal/act}/runner/job_executor.go (99%) rename {act => internal/act}/runner/job_executor_test.go (99%) rename {act => internal/act}/runner/job_hooks.go (97%) rename {act => internal/act}/runner/job_hooks_test.go (99%) rename {act => internal/act}/runner/local_repository_cache.go (97%) rename {act => internal/act}/runner/logger.go (99%) rename {act => internal/act}/runner/logger_test.go (100%) rename {act => internal/act}/runner/max_parallel_test.go (100%) rename {act => internal/act}/runner/res/trampoline.js (100%) rename {act => internal/act}/runner/reusable_workflow.go (99%) rename {act => internal/act}/runner/reusable_workflow_test.go (99%) rename {act => internal/act}/runner/run_context.go (99%) rename {act => internal/act}/runner/run_context_test.go (99%) rename {act => internal/act}/runner/runner.go (99%) rename {act => internal/act}/runner/runner_test.go (99%) rename {act => internal/act}/runner/step.go (99%) rename {act => internal/act}/runner/step_action_local.go (98%) rename {act => internal/act}/runner/step_action_local_test.go (99%) rename {act => internal/act}/runner/step_action_remote.go (99%) rename {act => internal/act}/runner/step_action_remote_test.go (99%) rename {act => internal/act}/runner/step_docker.go (97%) rename {act => internal/act}/runner/step_docker_test.go (99%) rename {act => internal/act}/runner/step_factory.go (100%) rename {act => internal/act}/runner/step_factory_test.go (100%) rename {act => internal/act}/runner/step_run.go (98%) rename {act => internal/act}/runner/step_run_print_test.go (99%) rename {act => internal/act}/runner/step_run_test.go (98%) rename {act => internal/act}/runner/step_test.go (99%) rename {act => internal/act}/runner/testdata/.github/workflows/local-reusable-workflow.yml (100%) rename {act => internal/act}/runner/testdata/GITHUB_ENV-use-in-env-ctx/push.yml (100%) rename {act => internal/act}/runner/testdata/GITHUB_STATE/push.yml (100%) rename {act => internal/act}/runner/testdata/act-composite-env-test/action1/action.yml (100%) rename {act => internal/act}/runner/testdata/act-composite-env-test/action2/action.yml (100%) rename {act => internal/act}/runner/testdata/act-composite-env-test/push.yml (100%) rename {act => internal/act}/runner/testdata/actions-environment-and-context-tests/docker/Dockerfile (100%) rename {act => internal/act}/runner/testdata/actions-environment-and-context-tests/docker/action.yml (100%) rename {act => internal/act}/runner/testdata/actions-environment-and-context-tests/docker/entrypoint.sh (100%) rename {act => internal/act}/runner/testdata/actions-environment-and-context-tests/js/action.yml (100%) rename {act => internal/act}/runner/testdata/actions-environment-and-context-tests/js/index.js (100%) rename {act => internal/act}/runner/testdata/actions-environment-and-context-tests/push.yml (100%) rename {act => internal/act}/runner/testdata/actions/action1/Dockerfile (100%) rename {act => internal/act}/runner/testdata/actions/action1/action.yml (100%) rename {act => internal/act}/runner/testdata/actions/composite-fail-with-output/action.yml (100%) rename {act => internal/act}/runner/testdata/actions/docker-local-noargs/Dockerfile (100%) rename {act => internal/act}/runner/testdata/actions/docker-local-noargs/action.yml (100%) rename {act => internal/act}/runner/testdata/actions/docker-local-noargs/entrypoint.sh (100%) rename {act => internal/act}/runner/testdata/actions/docker-local/Dockerfile (100%) rename {act => internal/act}/runner/testdata/actions/docker-local/action.yml (100%) rename {act => internal/act}/runner/testdata/actions/docker-local/entrypoint.sh (100%) rename {act => internal/act}/runner/testdata/actions/docker-url/action.yml (100%) rename {act => internal/act}/runner/testdata/actions/node24/.gitignore (100%) rename {act => internal/act}/runner/testdata/actions/node24/action.yml (100%) rename {act => internal/act}/runner/testdata/actions/node24/index.js (100%) rename {act => internal/act}/runner/testdata/actions/node24/package.json (100%) rename {act => internal/act}/runner/testdata/actions/script/action.yml (100%) rename {act => internal/act}/runner/testdata/actions/script/index.js (100%) rename {act => internal/act}/runner/testdata/actions/script/package.json (100%) rename {act => internal/act}/runner/testdata/actions/script/post.js (100%) rename {act => internal/act}/runner/testdata/basic/push.yml (100%) rename {act => internal/act}/runner/testdata/cache/nektos-test-override.git/HEAD (100%) rename {act => internal/act}/runner/testdata/cache/nektos-test-override.git/config (100%) rename {act => internal/act}/runner/testdata/checkout/push.yml (100%) rename {act => internal/act}/runner/testdata/commands/push.yml (100%) rename {act => internal/act}/runner/testdata/composite-fail-with-output/push.yml (100%) rename {act => internal/act}/runner/testdata/container-hostname/push.yml (100%) rename {act => internal/act}/runner/testdata/container-volumes/push.yml (100%) rename {act => internal/act}/runner/testdata/defaults-run/main.yaml (100%) rename {act => internal/act}/runner/testdata/do-not-leak-step-env-in-composite/push.yml (100%) rename {act => internal/act}/runner/testdata/docker-action-custom-path/push.yml (100%) rename {act => internal/act}/runner/testdata/ensure-post-steps/action-composite/action.yml (100%) rename {act => internal/act}/runner/testdata/ensure-post-steps/action-post/action.yml (100%) rename {act => internal/act}/runner/testdata/ensure-post-steps/action-post/main.js (100%) rename {act => internal/act}/runner/testdata/ensure-post-steps/action-post/post.js (100%) rename {act => internal/act}/runner/testdata/ensure-post-steps/push.yml (100%) rename {act => internal/act}/runner/testdata/env-and-path/push.yaml (100%) rename {act => internal/act}/runner/testdata/environment-files-parser-bug/push.yaml (100%) rename {act => internal/act}/runner/testdata/environment-files/push.yaml (100%) rename {act => internal/act}/runner/testdata/evalenv/push.yml (100%) rename {act => internal/act}/runner/testdata/evalmatrix-merge-array/push.yml (100%) rename {act => internal/act}/runner/testdata/evalmatrix-merge-map/push.yml (100%) rename {act => internal/act}/runner/testdata/evalmatrix/push.yml (100%) rename {act => internal/act}/runner/testdata/evalmatrixneeds/push.yml (100%) rename {act => internal/act}/runner/testdata/evalmatrixneeds2/push.yml (100%) rename {act => internal/act}/runner/testdata/fail/push.yml (100%) rename {act => internal/act}/runner/testdata/if-env-act/push.yml (100%) rename {act => internal/act}/runner/testdata/if-expressions/push.yml (100%) rename {act => internal/act}/runner/testdata/input-from-cli/input.yml (100%) rename {act => internal/act}/runner/testdata/inputs-via-env-context/action.yml (100%) rename {act => internal/act}/runner/testdata/inputs-via-env-context/push.yml (100%) rename {act => internal/act}/runner/testdata/issue-1595/missing.yml (100%) rename {act => internal/act}/runner/testdata/issue-1595/no-event.yml (100%) rename {act => internal/act}/runner/testdata/issue-1595/no-first.yml (100%) rename {act => internal/act}/runner/testdata/issue-597/spelling.yaml (100%) rename {act => internal/act}/runner/testdata/issue-598/spelling.yml (100%) rename {act => internal/act}/runner/testdata/job-container-invalid-credentials/push.yml (100%) rename {act => internal/act}/runner/testdata/job-container-non-root/push.yml (100%) rename {act => internal/act}/runner/testdata/job-container/push.yml (100%) rename {act => internal/act}/runner/testdata/job-needs-context-contains-result/push.yml (100%) rename {act => internal/act}/runner/testdata/job-nil-step/push.yml (100%) rename {act => internal/act}/runner/testdata/job-status-check/push.yml (100%) rename {act => internal/act}/runner/testdata/local-action-docker-url/push.yml (100%) rename {act => internal/act}/runner/testdata/local-action-dockerfile/push.yml (100%) rename {act => internal/act}/runner/testdata/local-action-js/push.yml (100%) rename {act => internal/act}/runner/testdata/local-action-via-composite-dockerfile/action.yml (100%) rename {act => internal/act}/runner/testdata/local-action-via-composite-dockerfile/push.yml (100%) rename {act => internal/act}/runner/testdata/local-remote-action-overrides/config.yml (100%) rename {act => internal/act}/runner/testdata/local-remote-action-overrides/push.yml (100%) rename {act => internal/act}/runner/testdata/mask-values/composite/action.yml (100%) rename {act => internal/act}/runner/testdata/mask-values/push.yml (100%) rename {act => internal/act}/runner/testdata/matrix-exitcode/push.yml (100%) rename {act => internal/act}/runner/testdata/matrix-with-user-inclusions/push.yml (100%) rename {act => internal/act}/runner/testdata/matrix/push.yml (100%) rename {act => internal/act}/runner/testdata/networking/push.yml (100%) rename {act => internal/act}/runner/testdata/nix-prepend-path/push.yml (100%) rename {act => internal/act}/runner/testdata/no-panic-on-invalid-composite-action/push.yml (100%) rename {act => internal/act}/runner/testdata/non-existent-action/push.yml (100%) rename {act => internal/act}/runner/testdata/outputs/push.yml (100%) rename {act => internal/act}/runner/testdata/path-handling/action.yml (100%) rename {act => internal/act}/runner/testdata/path-handling/push.yml (100%) rename {act => internal/act}/runner/testdata/pull-request/event.json (100%) rename {act => internal/act}/runner/testdata/pull-request/main.yaml (100%) rename {act => internal/act}/runner/testdata/secrets/.env (100%) rename {act => internal/act}/runner/testdata/secrets/.secrets (100%) rename {act => internal/act}/runner/testdata/secrets/push.yml (100%) rename {act => internal/act}/runner/testdata/services-empty-image/push.yml (100%) rename {act => internal/act}/runner/testdata/services-with-container/push.yml (100%) rename {act => internal/act}/runner/testdata/services/push.yaml (100%) rename {act => internal/act}/runner/testdata/set-env-new-env-file-per-step/push.yml (100%) rename {act => internal/act}/runner/testdata/set-env-step-env-override/push.yml (100%) rename {act => internal/act}/runner/testdata/shells/bash/push.yml (100%) rename {act => internal/act}/runner/testdata/shells/defaults/push.yml (100%) rename {act => internal/act}/runner/testdata/shells/pwsh/push.yml (100%) rename {act => internal/act}/runner/testdata/shells/sh/push.yml (100%) rename {act => internal/act}/runner/testdata/steps-context/conclusion/push.yml (100%) rename {act => internal/act}/runner/testdata/steps-context/outcome/push.yml (100%) rename {act => internal/act}/runner/testdata/uses-and-run-in-one-step/push.yml (100%) rename {act => internal/act}/runner/testdata/uses-composite-with-error/composite_action2/action.yml (100%) rename {act => internal/act}/runner/testdata/uses-composite-with-error/push.yml (100%) rename {act => internal/act}/runner/testdata/uses-composite/composite_action/action.yml (100%) rename {act => internal/act}/runner/testdata/uses-composite/push.yml (100%) rename {act => internal/act}/runner/testdata/uses-docker-url/push.yml (100%) rename {act => internal/act}/runner/testdata/uses-github-empty/push.yml (100%) rename {act => internal/act}/runner/testdata/uses-github-noref/push.yml (100%) rename {act => internal/act}/runner/testdata/uses-github-root/push.yml (100%) rename {act => internal/act}/runner/testdata/uses-workflow/push.yml (100%) rename {act => internal/act}/runner/testdata/windows-add-env/action.yml (100%) rename {act => internal/act}/runner/testdata/windows-add-env/push.yml (100%) rename {act => internal/act}/runner/testdata/windows-prepend-path/push.yml (100%) rename {act => internal/act}/runner/testdata/windows-shell-cmd/push.yml (100%) rename {act => internal/act}/runner/testdata/workdir/canary (100%) rename {act => internal/act}/runner/testdata/workdir/canary-link (100%) rename {act => internal/act}/runner/testdata/workdir/push.yml (100%) rename {act => internal/act}/runner/testdata/workflow_call_inputs/event.json (100%) rename {act => internal/act}/runner/testdata/workflow_call_inputs/workflow_call_inputs.yml (100%) rename {act => internal/act}/runner/testdata/workflow_dispatch-scalar-composite-action/workflow_dispatch.yml (100%) rename {act => internal/act}/runner/testdata/workflow_dispatch-scalar/workflow_dispatch.yml (100%) rename {act => internal/act}/runner/testdata/workflow_dispatch/event.json (100%) rename {act => internal/act}/runner/testdata/workflow_dispatch/workflow_dispatch.yml (100%) rename {act => internal/act}/runner/testdata/workflow_dispatch_no_inputs_mapping/workflow_dispatch.yml (100%) rename {act => internal/act}/runner/toolkit_patch.go (99%) rename {act => internal/act}/runner/toolkit_patch_e2e_test.go (99%) rename {act => internal/act}/runner/toolkit_patch_test.go (100%) diff --git a/act/LICENSE b/internal/act/LICENSE similarity index 100% rename from act/LICENSE rename to internal/act/LICENSE diff --git a/act/artifactcache/doc.go b/internal/act/artifactcache/doc.go similarity index 100% rename from act/artifactcache/doc.go rename to internal/act/artifactcache/doc.go diff --git a/act/artifactcache/handler.go b/internal/act/artifactcache/handler.go similarity index 99% rename from act/artifactcache/handler.go rename to internal/act/artifactcache/handler.go index 3cf2174a..a801c47f 100644 --- a/act/artifactcache/handler.go +++ b/internal/act/artifactcache/handler.go @@ -26,7 +26,7 @@ import ( "sync/atomic" "time" - "gitea.com/gitea/runner/act/common" + "gitea.com/gitea/runner/internal/act/common" "github.com/julienschmidt/httprouter" "github.com/sirupsen/logrus" diff --git a/act/artifactcache/handler_test.go b/internal/act/artifactcache/handler_test.go similarity index 100% rename from act/artifactcache/handler_test.go rename to internal/act/artifactcache/handler_test.go diff --git a/act/artifactcache/handler_v2.go b/internal/act/artifactcache/handler_v2.go similarity index 100% rename from act/artifactcache/handler_v2.go rename to internal/act/artifactcache/handler_v2.go diff --git a/act/artifactcache/handler_v2_test.go b/internal/act/artifactcache/handler_v2_test.go similarity index 100% rename from act/artifactcache/handler_v2_test.go rename to internal/act/artifactcache/handler_v2_test.go diff --git a/act/artifactcache/model.go b/internal/act/artifactcache/model.go similarity index 100% rename from act/artifactcache/model.go rename to internal/act/artifactcache/model.go diff --git a/act/artifactcache/results.go b/internal/act/artifactcache/results.go similarity index 100% rename from act/artifactcache/results.go rename to internal/act/artifactcache/results.go diff --git a/act/artifactcache/results_test.go b/internal/act/artifactcache/results_test.go similarity index 100% rename from act/artifactcache/results_test.go rename to internal/act/artifactcache/results_test.go diff --git a/act/artifactcache/storage.go b/internal/act/artifactcache/storage.go similarity index 100% rename from act/artifactcache/storage.go rename to internal/act/artifactcache/storage.go diff --git a/act/artifacts/server.go b/internal/act/artifacts/server.go similarity index 99% rename from act/artifacts/server.go rename to internal/act/artifacts/server.go index fb4e8b6b..918cd042 100644 --- a/act/artifacts/server.go +++ b/internal/act/artifacts/server.go @@ -17,7 +17,7 @@ import ( "strings" "time" - "gitea.com/gitea/runner/act/common" + "gitea.com/gitea/runner/internal/act/common" "github.com/julienschmidt/httprouter" ) diff --git a/act/artifacts/server_test.go b/internal/act/artifacts/server_test.go similarity index 100% rename from act/artifacts/server_test.go rename to internal/act/artifacts/server_test.go diff --git a/act/common/context_helpers_test.go b/internal/act/common/context_helpers_test.go similarity index 100% rename from act/common/context_helpers_test.go rename to internal/act/common/context_helpers_test.go diff --git a/act/common/dryrun.go b/internal/act/common/dryrun.go similarity index 100% rename from act/common/dryrun.go rename to internal/act/common/dryrun.go diff --git a/act/common/executor.go b/internal/act/common/executor.go similarity index 100% rename from act/common/executor.go rename to internal/act/common/executor.go diff --git a/act/common/executor_test.go b/internal/act/common/executor_test.go similarity index 100% rename from act/common/executor_test.go rename to internal/act/common/executor_test.go diff --git a/act/common/git/git.go b/internal/act/common/git/git.go similarity index 99% rename from act/common/git/git.go rename to internal/act/common/git/git.go index fab65532..952247b4 100644 --- a/act/common/git/git.go +++ b/internal/act/common/git/git.go @@ -15,7 +15,7 @@ import ( "strings" "sync" - "gitea.com/gitea/runner/act/common" + "gitea.com/gitea/runner/internal/act/common" "gitea.com/gitea/runner/internal/pkg/lock" "github.com/go-git/go-git/v5" diff --git a/act/common/git/git_test.go b/internal/act/common/git/git_test.go similarity index 99% rename from act/common/git/git_test.go rename to internal/act/common/git/git_test.go index 6984130e..6a1d1254 100644 --- a/act/common/git/git_test.go +++ b/internal/act/common/git/git_test.go @@ -16,7 +16,7 @@ import ( "testing" "time" - "gitea.com/gitea/runner/act/common" + "gitea.com/gitea/runner/internal/act/common" log "github.com/sirupsen/logrus" logrustest "github.com/sirupsen/logrus/hooks/test" diff --git a/act/common/job_error.go b/internal/act/common/job_error.go similarity index 100% rename from act/common/job_error.go rename to internal/act/common/job_error.go diff --git a/act/common/line_writer.go b/internal/act/common/line_writer.go similarity index 100% rename from act/common/line_writer.go rename to internal/act/common/line_writer.go diff --git a/act/common/line_writer_test.go b/internal/act/common/line_writer_test.go similarity index 100% rename from act/common/line_writer_test.go rename to internal/act/common/line_writer_test.go diff --git a/act/common/logger.go b/internal/act/common/logger.go similarity index 100% rename from act/common/logger.go rename to internal/act/common/logger.go diff --git a/act/common/outbound_ip.go b/internal/act/common/outbound_ip.go similarity index 100% rename from act/common/outbound_ip.go rename to internal/act/common/outbound_ip.go diff --git a/act/container/DOCKER_LICENSE b/internal/act/container/DOCKER_LICENSE similarity index 100% rename from act/container/DOCKER_LICENSE rename to internal/act/container/DOCKER_LICENSE diff --git a/act/container/container_types.go b/internal/act/container/container_types.go similarity index 98% rename from act/container/container_types.go rename to internal/act/container/container_types.go index f4df9700..3af7a459 100644 --- a/act/container/container_types.go +++ b/internal/act/container/container_types.go @@ -10,7 +10,7 @@ import ( "fmt" "io" - "gitea.com/gitea/runner/act/common" + "gitea.com/gitea/runner/internal/act/common" "github.com/docker/go-connections/nat" "github.com/moby/moby/api/types/container" diff --git a/act/container/docker_auth.go b/internal/act/container/docker_auth.go similarity index 97% rename from act/container/docker_auth.go rename to internal/act/container/docker_auth.go index 8f5f2fa8..6153de17 100644 --- a/act/container/docker_auth.go +++ b/internal/act/container/docker_auth.go @@ -9,7 +9,7 @@ package container import ( "context" - "gitea.com/gitea/runner/act/common" + "gitea.com/gitea/runner/internal/act/common" "github.com/distribution/reference" "github.com/docker/cli/cli/config" diff --git a/act/container/docker_build.go b/internal/act/container/docker_build.go similarity index 98% rename from act/container/docker_build.go rename to internal/act/container/docker_build.go index 2e072252..86f7a211 100644 --- a/act/container/docker_build.go +++ b/internal/act/container/docker_build.go @@ -12,7 +12,7 @@ import ( "os" "path/filepath" - "gitea.com/gitea/runner/act/common" + "gitea.com/gitea/runner/internal/act/common" "github.com/moby/go-archive" "github.com/moby/go-archive/compression" diff --git a/act/container/docker_cli.go b/internal/act/container/docker_cli.go similarity index 100% rename from act/container/docker_cli.go rename to internal/act/container/docker_cli.go diff --git a/act/container/docker_cli_test.go b/internal/act/container/docker_cli_test.go similarity index 100% rename from act/container/docker_cli_test.go rename to internal/act/container/docker_cli_test.go diff --git a/act/container/docker_create_flags.go b/internal/act/container/docker_create_flags.go similarity index 100% rename from act/container/docker_create_flags.go rename to internal/act/container/docker_create_flags.go diff --git a/act/container/docker_create_flags_test.go b/internal/act/container/docker_create_flags_test.go similarity index 100% rename from act/container/docker_create_flags_test.go rename to internal/act/container/docker_create_flags_test.go diff --git a/act/container/docker_images.go b/internal/act/container/docker_images.go similarity index 100% rename from act/container/docker_images.go rename to internal/act/container/docker_images.go diff --git a/act/container/docker_images_test.go b/internal/act/container/docker_images_test.go similarity index 100% rename from act/container/docker_images_test.go rename to internal/act/container/docker_images_test.go diff --git a/act/container/docker_logger.go b/internal/act/container/docker_logger.go similarity index 100% rename from act/container/docker_logger.go rename to internal/act/container/docker_logger.go diff --git a/act/container/docker_network.go b/internal/act/container/docker_network.go similarity index 99% rename from act/container/docker_network.go rename to internal/act/container/docker_network.go index 406d1907..8cc77dd7 100644 --- a/act/container/docker_network.go +++ b/internal/act/container/docker_network.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "gitea.com/gitea/runner/act/common" + "gitea.com/gitea/runner/internal/act/common" "github.com/moby/moby/client" ) diff --git a/act/container/docker_network_test.go b/internal/act/container/docker_network_test.go similarity index 100% rename from act/container/docker_network_test.go rename to internal/act/container/docker_network_test.go diff --git a/act/container/docker_platform.go b/internal/act/container/docker_platform.go similarity index 100% rename from act/container/docker_platform.go rename to internal/act/container/docker_platform.go diff --git a/act/container/docker_platform_test.go b/internal/act/container/docker_platform_test.go similarity index 100% rename from act/container/docker_platform_test.go rename to internal/act/container/docker_platform_test.go diff --git a/act/container/docker_pull.go b/internal/act/container/docker_pull.go similarity index 98% rename from act/container/docker_pull.go rename to internal/act/container/docker_pull.go index 3204dcc1..cd709bc4 100644 --- a/act/container/docker_pull.go +++ b/internal/act/container/docker_pull.go @@ -11,7 +11,7 @@ import ( "fmt" "strings" - "gitea.com/gitea/runner/act/common" + "gitea.com/gitea/runner/internal/act/common" "github.com/distribution/reference" "github.com/moby/moby/api/pkg/authconfig" diff --git a/act/container/docker_pull_test.go b/internal/act/container/docker_pull_test.go similarity index 100% rename from act/container/docker_pull_test.go rename to internal/act/container/docker_pull_test.go diff --git a/act/container/docker_run.go b/internal/act/container/docker_run.go similarity index 99% rename from act/container/docker_run.go rename to internal/act/container/docker_run.go index 20125229..a02d8140 100644 --- a/act/container/docker_run.go +++ b/internal/act/container/docker_run.go @@ -22,8 +22,8 @@ import ( "strings" "time" - "gitea.com/gitea/runner/act/common" - "gitea.com/gitea/runner/act/filecollector" + "gitea.com/gitea/runner/internal/act/common" + "gitea.com/gitea/runner/internal/act/filecollector" "dario.cat/mergo" cerrdefs "github.com/containerd/errdefs" diff --git a/act/container/docker_run_test.go b/internal/act/container/docker_run_test.go similarity index 99% rename from act/container/docker_run_test.go rename to internal/act/container/docker_run_test.go index 9ff339fa..63193f4a 100644 --- a/act/container/docker_run_test.go +++ b/internal/act/container/docker_run_test.go @@ -19,7 +19,7 @@ import ( "testing" "time" - "gitea.com/gitea/runner/act/common" + "gitea.com/gitea/runner/internal/act/common" cerrdefs "github.com/containerd/errdefs" "github.com/moby/moby/api/pkg/stdcopy" diff --git a/act/container/docker_socket.go b/internal/act/container/docker_socket.go similarity index 100% rename from act/container/docker_socket.go rename to internal/act/container/docker_socket.go diff --git a/act/container/docker_socket_test.go b/internal/act/container/docker_socket_test.go similarity index 100% rename from act/container/docker_socket_test.go rename to internal/act/container/docker_socket_test.go diff --git a/act/container/docker_stub.go b/internal/act/container/docker_stub.go similarity index 98% rename from act/container/docker_stub.go rename to internal/act/container/docker_stub.go index 0db4febe..908abc01 100644 --- a/act/container/docker_stub.go +++ b/internal/act/container/docker_stub.go @@ -12,7 +12,7 @@ import ( "runtime" "time" - "gitea.com/gitea/runner/act/common" + "gitea.com/gitea/runner/internal/act/common" "github.com/moby/moby/api/types/system" ) diff --git a/act/container/docker_volume.go b/internal/act/container/docker_volume.go similarity index 96% rename from act/container/docker_volume.go rename to internal/act/container/docker_volume.go index 30046ea7..5a358037 100644 --- a/act/container/docker_volume.go +++ b/internal/act/container/docker_volume.go @@ -9,7 +9,7 @@ package container import ( "context" - "gitea.com/gitea/runner/act/common" + "gitea.com/gitea/runner/internal/act/common" "github.com/moby/moby/client" ) diff --git a/act/container/executions_environment.go b/internal/act/container/executions_environment.go similarity index 100% rename from act/container/executions_environment.go rename to internal/act/container/executions_environment.go diff --git a/act/container/helpers_test.go b/internal/act/container/helpers_test.go similarity index 100% rename from act/container/helpers_test.go rename to internal/act/container/helpers_test.go diff --git a/act/container/host_environment.go b/internal/act/container/host_environment.go similarity index 99% rename from act/container/host_environment.go rename to internal/act/container/host_environment.go index f963cb70..48ce5ad9 100644 --- a/act/container/host_environment.go +++ b/internal/act/container/host_environment.go @@ -21,9 +21,9 @@ import ( "sync/atomic" "time" - "gitea.com/gitea/runner/act/common" - "gitea.com/gitea/runner/act/filecollector" - "gitea.com/gitea/runner/act/lookpath" + "gitea.com/gitea/runner/internal/act/common" + "gitea.com/gitea/runner/internal/act/filecollector" + "gitea.com/gitea/runner/internal/act/lookpath" "gitea.com/gitea/runner/internal/pkg/process" "github.com/go-git/go-billy/v5/helper/polyfill" diff --git a/act/container/host_environment_test.go b/internal/act/container/host_environment_test.go similarity index 99% rename from act/container/host_environment_test.go rename to internal/act/container/host_environment_test.go index 2f5d1c5e..8b728ac7 100644 --- a/act/container/host_environment_test.go +++ b/internal/act/container/host_environment_test.go @@ -17,7 +17,7 @@ import ( "testing" "time" - "gitea.com/gitea/runner/act/common" + "gitea.com/gitea/runner/internal/act/common" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" diff --git a/act/container/linux_container_environment_extensions.go b/internal/act/container/linux_container_environment_extensions.go similarity index 100% rename from act/container/linux_container_environment_extensions.go rename to internal/act/container/linux_container_environment_extensions.go diff --git a/act/container/linux_container_environment_extensions_test.go b/internal/act/container/linux_container_environment_extensions_test.go similarity index 100% rename from act/container/linux_container_environment_extensions_test.go rename to internal/act/container/linux_container_environment_extensions_test.go diff --git a/act/container/parse_env_file.go b/internal/act/container/parse_env_file.go similarity index 98% rename from act/container/parse_env_file.go rename to internal/act/container/parse_env_file.go index ec8f1545..96927533 100644 --- a/act/container/parse_env_file.go +++ b/internal/act/container/parse_env_file.go @@ -12,7 +12,7 @@ import ( "io" "strings" - "gitea.com/gitea/runner/act/common" + "gitea.com/gitea/runner/internal/act/common" "golang.org/x/text/encoding/unicode" "golang.org/x/text/transform" diff --git a/act/container/parse_env_file_test.go b/internal/act/container/parse_env_file_test.go similarity index 100% rename from act/container/parse_env_file_test.go rename to internal/act/container/parse_env_file_test.go diff --git a/act/container/testdata/Dockerfile b/internal/act/container/testdata/Dockerfile similarity index 100% rename from act/container/testdata/Dockerfile rename to internal/act/container/testdata/Dockerfile diff --git a/act/container/testdata/docker-pull-options/config.json b/internal/act/container/testdata/docker-pull-options/config.json similarity index 100% rename from act/container/testdata/docker-pull-options/config.json rename to internal/act/container/testdata/docker-pull-options/config.json diff --git a/act/container/testdata/scratch/test.txt b/internal/act/container/testdata/scratch/test.txt similarity index 100% rename from act/container/testdata/scratch/test.txt rename to internal/act/container/testdata/scratch/test.txt diff --git a/act/container/testdata/utf16.env b/internal/act/container/testdata/utf16.env similarity index 100% rename from act/container/testdata/utf16.env rename to internal/act/container/testdata/utf16.env diff --git a/act/container/testdata/utf16be.env b/internal/act/container/testdata/utf16be.env similarity index 100% rename from act/container/testdata/utf16be.env rename to internal/act/container/testdata/utf16be.env diff --git a/act/container/testdata/utf8.env b/internal/act/container/testdata/utf8.env similarity index 100% rename from act/container/testdata/utf8.env rename to internal/act/container/testdata/utf8.env diff --git a/act/container/testdata/valid.env b/internal/act/container/testdata/valid.env similarity index 100% rename from act/container/testdata/valid.env rename to internal/act/container/testdata/valid.env diff --git a/act/container/testdata/valid.label b/internal/act/container/testdata/valid.label similarity index 100% rename from act/container/testdata/valid.label rename to internal/act/container/testdata/valid.label diff --git a/act/container/util.go b/internal/act/container/util.go similarity index 100% rename from act/container/util.go rename to internal/act/container/util.go diff --git a/act/container/util_openbsd_mips64.go b/internal/act/container/util_openbsd_mips64.go similarity index 100% rename from act/container/util_openbsd_mips64.go rename to internal/act/container/util_openbsd_mips64.go diff --git a/act/container/util_plan9.go b/internal/act/container/util_plan9.go similarity index 100% rename from act/container/util_plan9.go rename to internal/act/container/util_plan9.go diff --git a/act/container/util_windows.go b/internal/act/container/util_windows.go similarity index 100% rename from act/container/util_windows.go rename to internal/act/container/util_windows.go diff --git a/act/filecollector/file_collector.go b/internal/act/filecollector/file_collector.go similarity index 100% rename from act/filecollector/file_collector.go rename to internal/act/filecollector/file_collector.go diff --git a/act/filecollector/file_collector_test.go b/internal/act/filecollector/file_collector_test.go similarity index 100% rename from act/filecollector/file_collector_test.go rename to internal/act/filecollector/file_collector_test.go diff --git a/act/ghcontext/github_context.go b/internal/act/ghcontext/github_context.go similarity index 97% rename from act/ghcontext/github_context.go rename to internal/act/ghcontext/github_context.go index 674b7d7f..a2991c1b 100644 --- a/act/ghcontext/github_context.go +++ b/internal/act/ghcontext/github_context.go @@ -13,8 +13,8 @@ import ( "fmt" "strings" - "gitea.com/gitea/runner/act/common" - "gitea.com/gitea/runner/act/common/git" + "gitea.com/gitea/runner/internal/act/common" + "gitea.com/gitea/runner/internal/act/common/git" "gitea.dev/actionslib/pkg/model" ) diff --git a/act/ghcontext/github_context_test.go b/internal/act/ghcontext/github_context_test.go similarity index 100% rename from act/ghcontext/github_context_test.go rename to internal/act/ghcontext/github_context_test.go diff --git a/act/lookpath/LICENSE b/internal/act/lookpath/LICENSE similarity index 100% rename from act/lookpath/LICENSE rename to internal/act/lookpath/LICENSE diff --git a/act/lookpath/env.go b/internal/act/lookpath/env.go similarity index 100% rename from act/lookpath/env.go rename to internal/act/lookpath/env.go diff --git a/act/lookpath/error.go b/internal/act/lookpath/error.go similarity index 100% rename from act/lookpath/error.go rename to internal/act/lookpath/error.go diff --git a/act/lookpath/lp_js.go b/internal/act/lookpath/lp_js.go similarity index 100% rename from act/lookpath/lp_js.go rename to internal/act/lookpath/lp_js.go diff --git a/act/lookpath/lp_plan9.go b/internal/act/lookpath/lp_plan9.go similarity index 100% rename from act/lookpath/lp_plan9.go rename to internal/act/lookpath/lp_plan9.go diff --git a/act/lookpath/lp_unix.go b/internal/act/lookpath/lp_unix.go similarity index 100% rename from act/lookpath/lp_unix.go rename to internal/act/lookpath/lp_unix.go diff --git a/act/lookpath/lp_unix_test.go b/internal/act/lookpath/lp_unix_test.go similarity index 100% rename from act/lookpath/lp_unix_test.go rename to internal/act/lookpath/lp_unix_test.go diff --git a/act/lookpath/lp_windows.go b/internal/act/lookpath/lp_windows.go similarity index 100% rename from act/lookpath/lp_windows.go rename to internal/act/lookpath/lp_windows.go diff --git a/act/runner/action.go b/internal/act/runner/action.go similarity index 99% rename from act/runner/action.go rename to internal/act/runner/action.go index bfc66c02..cb93e013 100644 --- a/act/runner/action.go +++ b/internal/act/runner/action.go @@ -20,9 +20,9 @@ import ( "runtime" "strings" - "gitea.com/gitea/runner/act/common" - "gitea.com/gitea/runner/act/common/git" - "gitea.com/gitea/runner/act/container" + "gitea.com/gitea/runner/internal/act/common" + "gitea.com/gitea/runner/internal/act/common/git" + "gitea.com/gitea/runner/internal/act/container" "gitea.dev/actionslib/pkg/model" "github.com/kballard/go-shellquote" diff --git a/act/runner/action_cache.go b/internal/act/runner/action_cache.go similarity index 100% rename from act/runner/action_cache.go rename to internal/act/runner/action_cache.go diff --git a/act/runner/action_cache_test.go b/internal/act/runner/action_cache_test.go similarity index 99% rename from act/runner/action_cache_test.go rename to internal/act/runner/action_cache_test.go index bdd7fba0..6a989214 100644 --- a/act/runner/action_cache_test.go +++ b/internal/act/runner/action_cache_test.go @@ -17,7 +17,7 @@ import ( "testing" "time" - "gitea.com/gitea/runner/act/common" + "gitea.com/gitea/runner/internal/act/common" "gitea.dev/actionslib/pkg/model" "github.com/stretchr/testify/assert" diff --git a/act/runner/action_composite.go b/internal/act/runner/action_composite.go similarity index 99% rename from act/runner/action_composite.go rename to internal/act/runner/action_composite.go index 70983c2b..80e7c06f 100644 --- a/act/runner/action_composite.go +++ b/internal/act/runner/action_composite.go @@ -12,7 +12,7 @@ import ( "strconv" "strings" - "gitea.com/gitea/runner/act/common" + "gitea.com/gitea/runner/internal/act/common" "gitea.dev/actionslib/pkg/model" ) diff --git a/act/runner/action_composite_test.go b/internal/act/runner/action_composite_test.go similarity index 100% rename from act/runner/action_composite_test.go rename to internal/act/runner/action_composite_test.go diff --git a/act/runner/action_test.go b/internal/act/runner/action_test.go similarity index 99% rename from act/runner/action_test.go rename to internal/act/runner/action_test.go index e358bef9..9de0d49c 100644 --- a/act/runner/action_test.go +++ b/internal/act/runner/action_test.go @@ -13,9 +13,9 @@ import ( "testing" "time" - "gitea.com/gitea/runner/act/common" - "gitea.com/gitea/runner/act/common/git" - "gitea.com/gitea/runner/act/container" + "gitea.com/gitea/runner/internal/act/common" + "gitea.com/gitea/runner/internal/act/common/git" + "gitea.com/gitea/runner/internal/act/container" "gitea.dev/actionslib/pkg/model" "github.com/stretchr/testify/assert" diff --git a/act/runner/cancellation_test.go b/internal/act/runner/cancellation_test.go similarity index 99% rename from act/runner/cancellation_test.go rename to internal/act/runner/cancellation_test.go index 3af3f5ed..8e4db88a 100644 --- a/act/runner/cancellation_test.go +++ b/internal/act/runner/cancellation_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "gitea.com/gitea/runner/act/common" + "gitea.com/gitea/runner/internal/act/common" "gitea.dev/actionslib/pkg/exprparser" "gitea.dev/actionslib/pkg/model" diff --git a/act/runner/command.go b/internal/act/runner/command.go similarity index 99% rename from act/runner/command.go rename to internal/act/runner/command.go index ef8fc836..8e516962 100644 --- a/act/runner/command.go +++ b/internal/act/runner/command.go @@ -10,7 +10,7 @@ import ( "regexp" "strings" - "gitea.com/gitea/runner/act/common" + "gitea.com/gitea/runner/internal/act/common" ) var commandPatternGA *regexp.Regexp diff --git a/act/runner/command_test.go b/internal/act/runner/command_test.go similarity index 99% rename from act/runner/command_test.go rename to internal/act/runner/command_test.go index 7f8031a0..50f0d80d 100644 --- a/act/runner/command_test.go +++ b/internal/act/runner/command_test.go @@ -11,7 +11,7 @@ import ( "os" "testing" - "gitea.com/gitea/runner/act/common" + "gitea.com/gitea/runner/internal/act/common" "gitea.dev/actionslib/pkg/model" "github.com/sirupsen/logrus/hooks/test" diff --git a/act/runner/container_mock_test.go b/internal/act/runner/container_mock_test.go similarity index 96% rename from act/runner/container_mock_test.go rename to internal/act/runner/container_mock_test.go index 8a56b26f..ce572581 100644 --- a/act/runner/container_mock_test.go +++ b/internal/act/runner/container_mock_test.go @@ -8,8 +8,8 @@ import ( "context" "io" - "gitea.com/gitea/runner/act/common" - "gitea.com/gitea/runner/act/container" + "gitea.com/gitea/runner/internal/act/common" + "gitea.com/gitea/runner/internal/act/container" "github.com/stretchr/testify/mock" ) diff --git a/act/runner/expression.go b/internal/act/runner/expression.go similarity index 99% rename from act/runner/expression.go rename to internal/act/runner/expression.go index 08bfa459..f93d5877 100644 --- a/act/runner/expression.go +++ b/internal/act/runner/expression.go @@ -15,8 +15,8 @@ import ( "strings" "time" - "gitea.com/gitea/runner/act/common" - "gitea.com/gitea/runner/act/container" + "gitea.com/gitea/runner/internal/act/common" + "gitea.com/gitea/runner/internal/act/container" _ "embed" diff --git a/act/runner/expression_test.go b/internal/act/runner/expression_test.go similarity index 100% rename from act/runner/expression_test.go rename to internal/act/runner/expression_test.go diff --git a/act/runner/hashfiles/index.js b/internal/act/runner/hashfiles/index.js similarity index 100% rename from act/runner/hashfiles/index.js rename to internal/act/runner/hashfiles/index.js diff --git a/act/runner/helpers_test.go b/internal/act/runner/helpers_test.go similarity index 97% rename from act/runner/helpers_test.go rename to internal/act/runner/helpers_test.go index 40434dfa..52d9531c 100644 --- a/act/runner/helpers_test.go +++ b/internal/act/runner/helpers_test.go @@ -9,7 +9,7 @@ import ( "runtime" "testing" - "gitea.com/gitea/runner/act/container" + "gitea.com/gitea/runner/internal/act/container" mobyclient "github.com/moby/moby/client" ) diff --git a/act/runner/job_executor.go b/internal/act/runner/job_executor.go similarity index 99% rename from act/runner/job_executor.go rename to internal/act/runner/job_executor.go index 81bc84cd..85e2acb3 100644 --- a/act/runner/job_executor.go +++ b/internal/act/runner/job_executor.go @@ -21,8 +21,8 @@ import ( "time" "unicode" - "gitea.com/gitea/runner/act/common" - "gitea.com/gitea/runner/act/container" + "gitea.com/gitea/runner/internal/act/common" + "gitea.com/gitea/runner/internal/act/container" "gitea.dev/actionslib/pkg/exprparser" "gitea.dev/actionslib/pkg/model" diff --git a/act/runner/job_executor_test.go b/internal/act/runner/job_executor_test.go similarity index 99% rename from act/runner/job_executor_test.go rename to internal/act/runner/job_executor_test.go index 6e7fc2b5..db44762a 100644 --- a/act/runner/job_executor_test.go +++ b/internal/act/runner/job_executor_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "gitea.com/gitea/runner/act/common" - "gitea.com/gitea/runner/act/container" + "gitea.com/gitea/runner/internal/act/common" + "gitea.com/gitea/runner/internal/act/container" "gitea.dev/actionslib/pkg/model" log "github.com/sirupsen/logrus" diff --git a/act/runner/job_hooks.go b/internal/act/runner/job_hooks.go similarity index 97% rename from act/runner/job_hooks.go rename to internal/act/runner/job_hooks.go index e39ee739..a483d5bf 100644 --- a/act/runner/job_hooks.go +++ b/internal/act/runner/job_hooks.go @@ -11,8 +11,8 @@ import ( "path" "strings" - "gitea.com/gitea/runner/act/common" - "gitea.com/gitea/runner/act/container" + "gitea.com/gitea/runner/internal/act/common" + "gitea.com/gitea/runner/internal/act/container" ) // GitHub's job-hook variables, read as a fallback when the settings are unset. diff --git a/act/runner/job_hooks_test.go b/internal/act/runner/job_hooks_test.go similarity index 99% rename from act/runner/job_hooks_test.go rename to internal/act/runner/job_hooks_test.go index ec6ca331..f32224fc 100644 --- a/act/runner/job_hooks_test.go +++ b/internal/act/runner/job_hooks_test.go @@ -11,7 +11,7 @@ import ( "maps" "testing" - "gitea.com/gitea/runner/act/common" + "gitea.com/gitea/runner/internal/act/common" "gitea.dev/actionslib/pkg/model" "github.com/sirupsen/logrus/hooks/test" diff --git a/act/runner/local_repository_cache.go b/internal/act/runner/local_repository_cache.go similarity index 97% rename from act/runner/local_repository_cache.go rename to internal/act/runner/local_repository_cache.go index d8e1ebad..c2870104 100644 --- a/act/runner/local_repository_cache.go +++ b/internal/act/runner/local_repository_cache.go @@ -16,7 +16,7 @@ import ( "path/filepath" "strings" - "gitea.com/gitea/runner/act/filecollector" + "gitea.com/gitea/runner/internal/act/filecollector" ) type LocalRepositoryCache struct { diff --git a/act/runner/logger.go b/internal/act/runner/logger.go similarity index 99% rename from act/runner/logger.go rename to internal/act/runner/logger.go index 615fc0e4..2e41c64e 100644 --- a/act/runner/logger.go +++ b/internal/act/runner/logger.go @@ -17,7 +17,7 @@ import ( "strings" "sync" - "gitea.com/gitea/runner/act/common" + "gitea.com/gitea/runner/internal/act/common" "github.com/sirupsen/logrus" "golang.org/x/term" diff --git a/act/runner/logger_test.go b/internal/act/runner/logger_test.go similarity index 100% rename from act/runner/logger_test.go rename to internal/act/runner/logger_test.go diff --git a/act/runner/max_parallel_test.go b/internal/act/runner/max_parallel_test.go similarity index 100% rename from act/runner/max_parallel_test.go rename to internal/act/runner/max_parallel_test.go diff --git a/act/runner/res/trampoline.js b/internal/act/runner/res/trampoline.js similarity index 100% rename from act/runner/res/trampoline.js rename to internal/act/runner/res/trampoline.js diff --git a/act/runner/reusable_workflow.go b/internal/act/runner/reusable_workflow.go similarity index 99% rename from act/runner/reusable_workflow.go rename to internal/act/runner/reusable_workflow.go index c90d19fe..c8e7556d 100644 --- a/act/runner/reusable_workflow.go +++ b/internal/act/runner/reusable_workflow.go @@ -14,8 +14,8 @@ import ( "regexp" "strings" - "gitea.com/gitea/runner/act/common" - "gitea.com/gitea/runner/act/common/git" + "gitea.com/gitea/runner/internal/act/common" + "gitea.com/gitea/runner/internal/act/common/git" "gitea.dev/actionslib/pkg/model" ) diff --git a/act/runner/reusable_workflow_test.go b/internal/act/runner/reusable_workflow_test.go similarity index 99% rename from act/runner/reusable_workflow_test.go rename to internal/act/runner/reusable_workflow_test.go index 49e8840b..fd8b18fb 100644 --- a/act/runner/reusable_workflow_test.go +++ b/internal/act/runner/reusable_workflow_test.go @@ -13,7 +13,7 @@ import ( "testing" "time" - "gitea.com/gitea/runner/act/common/git" + "gitea.com/gitea/runner/internal/act/common/git" "gitea.dev/actionslib/pkg/model" "github.com/stretchr/testify/require" diff --git a/act/runner/run_context.go b/internal/act/runner/run_context.go similarity index 99% rename from act/runner/run_context.go rename to internal/act/runner/run_context.go index 5b7c90e3..8af9ee40 100644 --- a/act/runner/run_context.go +++ b/internal/act/runner/run_context.go @@ -25,9 +25,9 @@ import ( "sync" "time" - "gitea.com/gitea/runner/act/common" - "gitea.com/gitea/runner/act/container" - "gitea.com/gitea/runner/act/ghcontext" + "gitea.com/gitea/runner/internal/act/common" + "gitea.com/gitea/runner/internal/act/container" + "gitea.com/gitea/runner/internal/act/ghcontext" "gitea.com/gitea/runner/internal/pkg/lock" "gitea.dev/actionslib/pkg/exprparser" diff --git a/act/runner/run_context_test.go b/internal/act/runner/run_context_test.go similarity index 99% rename from act/runner/run_context_test.go rename to internal/act/runner/run_context_test.go index dcc8edc6..11c0b96b 100644 --- a/act/runner/run_context_test.go +++ b/internal/act/runner/run_context_test.go @@ -15,8 +15,8 @@ import ( "testing" "time" - "gitea.com/gitea/runner/act/common" - "gitea.com/gitea/runner/act/container" + "gitea.com/gitea/runner/internal/act/common" + "gitea.com/gitea/runner/internal/act/container" "gitea.dev/actionslib/pkg/exprparser" "gitea.dev/actionslib/pkg/model" diff --git a/act/runner/runner.go b/internal/act/runner/runner.go similarity index 99% rename from act/runner/runner.go rename to internal/act/runner/runner.go index 5995149b..b84d107f 100644 --- a/act/runner/runner.go +++ b/internal/act/runner/runner.go @@ -14,8 +14,8 @@ import ( "sync" "time" - "gitea.com/gitea/runner/act/common" - "gitea.com/gitea/runner/act/container" + "gitea.com/gitea/runner/internal/act/common" + "gitea.com/gitea/runner/internal/act/container" "gitea.dev/actionslib/pkg/model" docker_container "github.com/moby/moby/api/types/container" diff --git a/act/runner/runner_test.go b/internal/act/runner/runner_test.go similarity index 99% rename from act/runner/runner_test.go rename to internal/act/runner/runner_test.go index 19434a59..fc1240ac 100644 --- a/act/runner/runner_test.go +++ b/internal/act/runner/runner_test.go @@ -18,7 +18,7 @@ import ( "testing" "time" - "gitea.com/gitea/runner/act/common" + "gitea.com/gitea/runner/internal/act/common" "gitea.dev/actionslib/pkg/model" "github.com/joho/godotenv" diff --git a/act/runner/step.go b/internal/act/runner/step.go similarity index 99% rename from act/runner/step.go rename to internal/act/runner/step.go index 619f878a..0dda72ed 100644 --- a/act/runner/step.go +++ b/internal/act/runner/step.go @@ -13,8 +13,8 @@ import ( "strings" "time" - "gitea.com/gitea/runner/act/common" - "gitea.com/gitea/runner/act/container" + "gitea.com/gitea/runner/internal/act/common" + "gitea.com/gitea/runner/internal/act/container" "gitea.dev/actionslib/pkg/exprparser" "gitea.dev/actionslib/pkg/model" diff --git a/act/runner/step_action_local.go b/internal/act/runner/step_action_local.go similarity index 98% rename from act/runner/step_action_local.go rename to internal/act/runner/step_action_local.go index 77e08b34..cc30933b 100644 --- a/act/runner/step_action_local.go +++ b/internal/act/runner/step_action_local.go @@ -15,7 +15,7 @@ import ( "path" "path/filepath" - "gitea.com/gitea/runner/act/common" + "gitea.com/gitea/runner/internal/act/common" "gitea.dev/actionslib/pkg/model" ) diff --git a/act/runner/step_action_local_test.go b/internal/act/runner/step_action_local_test.go similarity index 99% rename from act/runner/step_action_local_test.go rename to internal/act/runner/step_action_local_test.go index c01d4868..b54ddf51 100644 --- a/act/runner/step_action_local_test.go +++ b/internal/act/runner/step_action_local_test.go @@ -12,7 +12,7 @@ import ( "strings" "testing" - "gitea.com/gitea/runner/act/common" + "gitea.com/gitea/runner/internal/act/common" "gitea.dev/actionslib/pkg/model" "github.com/stretchr/testify/assert" diff --git a/act/runner/step_action_remote.go b/internal/act/runner/step_action_remote.go similarity index 99% rename from act/runner/step_action_remote.go rename to internal/act/runner/step_action_remote.go index f42bf6a6..71f9ec57 100644 --- a/act/runner/step_action_remote.go +++ b/internal/act/runner/step_action_remote.go @@ -16,8 +16,8 @@ import ( "regexp" "strings" - "gitea.com/gitea/runner/act/common" - "gitea.com/gitea/runner/act/common/git" + "gitea.com/gitea/runner/internal/act/common" + "gitea.com/gitea/runner/internal/act/common/git" "gitea.dev/actionslib/pkg/model" gogit "github.com/go-git/go-git/v5" diff --git a/act/runner/step_action_remote_test.go b/internal/act/runner/step_action_remote_test.go similarity index 99% rename from act/runner/step_action_remote_test.go rename to internal/act/runner/step_action_remote_test.go index da5ba364..e46b9424 100644 --- a/act/runner/step_action_remote_test.go +++ b/internal/act/runner/step_action_remote_test.go @@ -17,8 +17,8 @@ import ( "testing" "time" - "gitea.com/gitea/runner/act/common" - "gitea.com/gitea/runner/act/common/git" + "gitea.com/gitea/runner/internal/act/common" + "gitea.com/gitea/runner/internal/act/common/git" "gitea.dev/actionslib/pkg/model" "github.com/stretchr/testify/assert" diff --git a/act/runner/step_docker.go b/internal/act/runner/step_docker.go similarity index 97% rename from act/runner/step_docker.go rename to internal/act/runner/step_docker.go index b8efdfca..d2a58742 100644 --- a/act/runner/step_docker.go +++ b/internal/act/runner/step_docker.go @@ -9,8 +9,8 @@ import ( "fmt" "strings" - "gitea.com/gitea/runner/act/common" - "gitea.com/gitea/runner/act/container" + "gitea.com/gitea/runner/internal/act/common" + "gitea.com/gitea/runner/internal/act/container" "gitea.dev/actionslib/pkg/model" "github.com/kballard/go-shellquote" diff --git a/act/runner/step_docker_test.go b/internal/act/runner/step_docker_test.go similarity index 99% rename from act/runner/step_docker_test.go rename to internal/act/runner/step_docker_test.go index 3afe1731..a587ae51 100644 --- a/act/runner/step_docker_test.go +++ b/internal/act/runner/step_docker_test.go @@ -11,7 +11,7 @@ import ( "strings" "testing" - "gitea.com/gitea/runner/act/container" + "gitea.com/gitea/runner/internal/act/container" "gitea.dev/actionslib/pkg/model" "github.com/stretchr/testify/assert" diff --git a/act/runner/step_factory.go b/internal/act/runner/step_factory.go similarity index 100% rename from act/runner/step_factory.go rename to internal/act/runner/step_factory.go diff --git a/act/runner/step_factory_test.go b/internal/act/runner/step_factory_test.go similarity index 100% rename from act/runner/step_factory_test.go rename to internal/act/runner/step_factory_test.go diff --git a/act/runner/step_run.go b/internal/act/runner/step_run.go similarity index 98% rename from act/runner/step_run.go rename to internal/act/runner/step_run.go index 5ac470c7..710062ad 100644 --- a/act/runner/step_run.go +++ b/internal/act/runner/step_run.go @@ -12,9 +12,9 @@ import ( "slices" "strings" - "gitea.com/gitea/runner/act/common" - "gitea.com/gitea/runner/act/container" - "gitea.com/gitea/runner/act/lookpath" + "gitea.com/gitea/runner/internal/act/common" + "gitea.com/gitea/runner/internal/act/container" + "gitea.com/gitea/runner/internal/act/lookpath" "gitea.dev/actionslib/pkg/model" "github.com/kballard/go-shellquote" diff --git a/act/runner/step_run_print_test.go b/internal/act/runner/step_run_print_test.go similarity index 99% rename from act/runner/step_run_print_test.go rename to internal/act/runner/step_run_print_test.go index da05030c..bc6906f4 100644 --- a/act/runner/step_run_print_test.go +++ b/internal/act/runner/step_run_print_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "gitea.com/gitea/runner/act/common" + "gitea.com/gitea/runner/internal/act/common" "gitea.dev/actionslib/pkg/model" "github.com/sirupsen/logrus" diff --git a/act/runner/step_run_test.go b/internal/act/runner/step_run_test.go similarity index 98% rename from act/runner/step_run_test.go rename to internal/act/runner/step_run_test.go index e16b2033..5d48594e 100644 --- a/act/runner/step_run_test.go +++ b/internal/act/runner/step_run_test.go @@ -10,7 +10,7 @@ import ( "io" "testing" - "gitea.com/gitea/runner/act/container" + "gitea.com/gitea/runner/internal/act/container" "gitea.dev/actionslib/pkg/model" "github.com/stretchr/testify/assert" diff --git a/act/runner/step_test.go b/internal/act/runner/step_test.go similarity index 99% rename from act/runner/step_test.go rename to internal/act/runner/step_test.go index fa1fa326..0e32504d 100644 --- a/act/runner/step_test.go +++ b/internal/act/runner/step_test.go @@ -9,7 +9,7 @@ import ( "errors" "testing" - "gitea.com/gitea/runner/act/common" + "gitea.com/gitea/runner/internal/act/common" "gitea.dev/actionslib/pkg/model" log "github.com/sirupsen/logrus" diff --git a/act/runner/testdata/.github/workflows/local-reusable-workflow.yml b/internal/act/runner/testdata/.github/workflows/local-reusable-workflow.yml similarity index 100% rename from act/runner/testdata/.github/workflows/local-reusable-workflow.yml rename to internal/act/runner/testdata/.github/workflows/local-reusable-workflow.yml diff --git a/act/runner/testdata/GITHUB_ENV-use-in-env-ctx/push.yml b/internal/act/runner/testdata/GITHUB_ENV-use-in-env-ctx/push.yml similarity index 100% rename from act/runner/testdata/GITHUB_ENV-use-in-env-ctx/push.yml rename to internal/act/runner/testdata/GITHUB_ENV-use-in-env-ctx/push.yml diff --git a/act/runner/testdata/GITHUB_STATE/push.yml b/internal/act/runner/testdata/GITHUB_STATE/push.yml similarity index 100% rename from act/runner/testdata/GITHUB_STATE/push.yml rename to internal/act/runner/testdata/GITHUB_STATE/push.yml diff --git a/act/runner/testdata/act-composite-env-test/action1/action.yml b/internal/act/runner/testdata/act-composite-env-test/action1/action.yml similarity index 100% rename from act/runner/testdata/act-composite-env-test/action1/action.yml rename to internal/act/runner/testdata/act-composite-env-test/action1/action.yml diff --git a/act/runner/testdata/act-composite-env-test/action2/action.yml b/internal/act/runner/testdata/act-composite-env-test/action2/action.yml similarity index 100% rename from act/runner/testdata/act-composite-env-test/action2/action.yml rename to internal/act/runner/testdata/act-composite-env-test/action2/action.yml diff --git a/act/runner/testdata/act-composite-env-test/push.yml b/internal/act/runner/testdata/act-composite-env-test/push.yml similarity index 100% rename from act/runner/testdata/act-composite-env-test/push.yml rename to internal/act/runner/testdata/act-composite-env-test/push.yml diff --git a/act/runner/testdata/actions-environment-and-context-tests/docker/Dockerfile b/internal/act/runner/testdata/actions-environment-and-context-tests/docker/Dockerfile similarity index 100% rename from act/runner/testdata/actions-environment-and-context-tests/docker/Dockerfile rename to internal/act/runner/testdata/actions-environment-and-context-tests/docker/Dockerfile diff --git a/act/runner/testdata/actions-environment-and-context-tests/docker/action.yml b/internal/act/runner/testdata/actions-environment-and-context-tests/docker/action.yml similarity index 100% rename from act/runner/testdata/actions-environment-and-context-tests/docker/action.yml rename to internal/act/runner/testdata/actions-environment-and-context-tests/docker/action.yml diff --git a/act/runner/testdata/actions-environment-and-context-tests/docker/entrypoint.sh b/internal/act/runner/testdata/actions-environment-and-context-tests/docker/entrypoint.sh similarity index 100% rename from act/runner/testdata/actions-environment-and-context-tests/docker/entrypoint.sh rename to internal/act/runner/testdata/actions-environment-and-context-tests/docker/entrypoint.sh diff --git a/act/runner/testdata/actions-environment-and-context-tests/js/action.yml b/internal/act/runner/testdata/actions-environment-and-context-tests/js/action.yml similarity index 100% rename from act/runner/testdata/actions-environment-and-context-tests/js/action.yml rename to internal/act/runner/testdata/actions-environment-and-context-tests/js/action.yml diff --git a/act/runner/testdata/actions-environment-and-context-tests/js/index.js b/internal/act/runner/testdata/actions-environment-and-context-tests/js/index.js similarity index 100% rename from act/runner/testdata/actions-environment-and-context-tests/js/index.js rename to internal/act/runner/testdata/actions-environment-and-context-tests/js/index.js diff --git a/act/runner/testdata/actions-environment-and-context-tests/push.yml b/internal/act/runner/testdata/actions-environment-and-context-tests/push.yml similarity index 100% rename from act/runner/testdata/actions-environment-and-context-tests/push.yml rename to internal/act/runner/testdata/actions-environment-and-context-tests/push.yml diff --git a/act/runner/testdata/actions/action1/Dockerfile b/internal/act/runner/testdata/actions/action1/Dockerfile similarity index 100% rename from act/runner/testdata/actions/action1/Dockerfile rename to internal/act/runner/testdata/actions/action1/Dockerfile diff --git a/act/runner/testdata/actions/action1/action.yml b/internal/act/runner/testdata/actions/action1/action.yml similarity index 100% rename from act/runner/testdata/actions/action1/action.yml rename to internal/act/runner/testdata/actions/action1/action.yml diff --git a/act/runner/testdata/actions/composite-fail-with-output/action.yml b/internal/act/runner/testdata/actions/composite-fail-with-output/action.yml similarity index 100% rename from act/runner/testdata/actions/composite-fail-with-output/action.yml rename to internal/act/runner/testdata/actions/composite-fail-with-output/action.yml diff --git a/act/runner/testdata/actions/docker-local-noargs/Dockerfile b/internal/act/runner/testdata/actions/docker-local-noargs/Dockerfile similarity index 100% rename from act/runner/testdata/actions/docker-local-noargs/Dockerfile rename to internal/act/runner/testdata/actions/docker-local-noargs/Dockerfile diff --git a/act/runner/testdata/actions/docker-local-noargs/action.yml b/internal/act/runner/testdata/actions/docker-local-noargs/action.yml similarity index 100% rename from act/runner/testdata/actions/docker-local-noargs/action.yml rename to internal/act/runner/testdata/actions/docker-local-noargs/action.yml diff --git a/act/runner/testdata/actions/docker-local-noargs/entrypoint.sh b/internal/act/runner/testdata/actions/docker-local-noargs/entrypoint.sh similarity index 100% rename from act/runner/testdata/actions/docker-local-noargs/entrypoint.sh rename to internal/act/runner/testdata/actions/docker-local-noargs/entrypoint.sh diff --git a/act/runner/testdata/actions/docker-local/Dockerfile b/internal/act/runner/testdata/actions/docker-local/Dockerfile similarity index 100% rename from act/runner/testdata/actions/docker-local/Dockerfile rename to internal/act/runner/testdata/actions/docker-local/Dockerfile diff --git a/act/runner/testdata/actions/docker-local/action.yml b/internal/act/runner/testdata/actions/docker-local/action.yml similarity index 100% rename from act/runner/testdata/actions/docker-local/action.yml rename to internal/act/runner/testdata/actions/docker-local/action.yml diff --git a/act/runner/testdata/actions/docker-local/entrypoint.sh b/internal/act/runner/testdata/actions/docker-local/entrypoint.sh similarity index 100% rename from act/runner/testdata/actions/docker-local/entrypoint.sh rename to internal/act/runner/testdata/actions/docker-local/entrypoint.sh diff --git a/act/runner/testdata/actions/docker-url/action.yml b/internal/act/runner/testdata/actions/docker-url/action.yml similarity index 100% rename from act/runner/testdata/actions/docker-url/action.yml rename to internal/act/runner/testdata/actions/docker-url/action.yml diff --git a/act/runner/testdata/actions/node24/.gitignore b/internal/act/runner/testdata/actions/node24/.gitignore similarity index 100% rename from act/runner/testdata/actions/node24/.gitignore rename to internal/act/runner/testdata/actions/node24/.gitignore diff --git a/act/runner/testdata/actions/node24/action.yml b/internal/act/runner/testdata/actions/node24/action.yml similarity index 100% rename from act/runner/testdata/actions/node24/action.yml rename to internal/act/runner/testdata/actions/node24/action.yml diff --git a/act/runner/testdata/actions/node24/index.js b/internal/act/runner/testdata/actions/node24/index.js similarity index 100% rename from act/runner/testdata/actions/node24/index.js rename to internal/act/runner/testdata/actions/node24/index.js diff --git a/act/runner/testdata/actions/node24/package.json b/internal/act/runner/testdata/actions/node24/package.json similarity index 100% rename from act/runner/testdata/actions/node24/package.json rename to internal/act/runner/testdata/actions/node24/package.json diff --git a/act/runner/testdata/actions/script/action.yml b/internal/act/runner/testdata/actions/script/action.yml similarity index 100% rename from act/runner/testdata/actions/script/action.yml rename to internal/act/runner/testdata/actions/script/action.yml diff --git a/act/runner/testdata/actions/script/index.js b/internal/act/runner/testdata/actions/script/index.js similarity index 100% rename from act/runner/testdata/actions/script/index.js rename to internal/act/runner/testdata/actions/script/index.js diff --git a/act/runner/testdata/actions/script/package.json b/internal/act/runner/testdata/actions/script/package.json similarity index 100% rename from act/runner/testdata/actions/script/package.json rename to internal/act/runner/testdata/actions/script/package.json diff --git a/act/runner/testdata/actions/script/post.js b/internal/act/runner/testdata/actions/script/post.js similarity index 100% rename from act/runner/testdata/actions/script/post.js rename to internal/act/runner/testdata/actions/script/post.js diff --git a/act/runner/testdata/basic/push.yml b/internal/act/runner/testdata/basic/push.yml similarity index 100% rename from act/runner/testdata/basic/push.yml rename to internal/act/runner/testdata/basic/push.yml diff --git a/act/runner/testdata/cache/nektos-test-override.git/HEAD b/internal/act/runner/testdata/cache/nektos-test-override.git/HEAD similarity index 100% rename from act/runner/testdata/cache/nektos-test-override.git/HEAD rename to internal/act/runner/testdata/cache/nektos-test-override.git/HEAD diff --git a/act/runner/testdata/cache/nektos-test-override.git/config b/internal/act/runner/testdata/cache/nektos-test-override.git/config similarity index 100% rename from act/runner/testdata/cache/nektos-test-override.git/config rename to internal/act/runner/testdata/cache/nektos-test-override.git/config diff --git a/act/runner/testdata/checkout/push.yml b/internal/act/runner/testdata/checkout/push.yml similarity index 100% rename from act/runner/testdata/checkout/push.yml rename to internal/act/runner/testdata/checkout/push.yml diff --git a/act/runner/testdata/commands/push.yml b/internal/act/runner/testdata/commands/push.yml similarity index 100% rename from act/runner/testdata/commands/push.yml rename to internal/act/runner/testdata/commands/push.yml diff --git a/act/runner/testdata/composite-fail-with-output/push.yml b/internal/act/runner/testdata/composite-fail-with-output/push.yml similarity index 100% rename from act/runner/testdata/composite-fail-with-output/push.yml rename to internal/act/runner/testdata/composite-fail-with-output/push.yml diff --git a/act/runner/testdata/container-hostname/push.yml b/internal/act/runner/testdata/container-hostname/push.yml similarity index 100% rename from act/runner/testdata/container-hostname/push.yml rename to internal/act/runner/testdata/container-hostname/push.yml diff --git a/act/runner/testdata/container-volumes/push.yml b/internal/act/runner/testdata/container-volumes/push.yml similarity index 100% rename from act/runner/testdata/container-volumes/push.yml rename to internal/act/runner/testdata/container-volumes/push.yml diff --git a/act/runner/testdata/defaults-run/main.yaml b/internal/act/runner/testdata/defaults-run/main.yaml similarity index 100% rename from act/runner/testdata/defaults-run/main.yaml rename to internal/act/runner/testdata/defaults-run/main.yaml diff --git a/act/runner/testdata/do-not-leak-step-env-in-composite/push.yml b/internal/act/runner/testdata/do-not-leak-step-env-in-composite/push.yml similarity index 100% rename from act/runner/testdata/do-not-leak-step-env-in-composite/push.yml rename to internal/act/runner/testdata/do-not-leak-step-env-in-composite/push.yml diff --git a/act/runner/testdata/docker-action-custom-path/push.yml b/internal/act/runner/testdata/docker-action-custom-path/push.yml similarity index 100% rename from act/runner/testdata/docker-action-custom-path/push.yml rename to internal/act/runner/testdata/docker-action-custom-path/push.yml diff --git a/act/runner/testdata/ensure-post-steps/action-composite/action.yml b/internal/act/runner/testdata/ensure-post-steps/action-composite/action.yml similarity index 100% rename from act/runner/testdata/ensure-post-steps/action-composite/action.yml rename to internal/act/runner/testdata/ensure-post-steps/action-composite/action.yml diff --git a/act/runner/testdata/ensure-post-steps/action-post/action.yml b/internal/act/runner/testdata/ensure-post-steps/action-post/action.yml similarity index 100% rename from act/runner/testdata/ensure-post-steps/action-post/action.yml rename to internal/act/runner/testdata/ensure-post-steps/action-post/action.yml diff --git a/act/runner/testdata/ensure-post-steps/action-post/main.js b/internal/act/runner/testdata/ensure-post-steps/action-post/main.js similarity index 100% rename from act/runner/testdata/ensure-post-steps/action-post/main.js rename to internal/act/runner/testdata/ensure-post-steps/action-post/main.js diff --git a/act/runner/testdata/ensure-post-steps/action-post/post.js b/internal/act/runner/testdata/ensure-post-steps/action-post/post.js similarity index 100% rename from act/runner/testdata/ensure-post-steps/action-post/post.js rename to internal/act/runner/testdata/ensure-post-steps/action-post/post.js diff --git a/act/runner/testdata/ensure-post-steps/push.yml b/internal/act/runner/testdata/ensure-post-steps/push.yml similarity index 100% rename from act/runner/testdata/ensure-post-steps/push.yml rename to internal/act/runner/testdata/ensure-post-steps/push.yml diff --git a/act/runner/testdata/env-and-path/push.yaml b/internal/act/runner/testdata/env-and-path/push.yaml similarity index 100% rename from act/runner/testdata/env-and-path/push.yaml rename to internal/act/runner/testdata/env-and-path/push.yaml diff --git a/act/runner/testdata/environment-files-parser-bug/push.yaml b/internal/act/runner/testdata/environment-files-parser-bug/push.yaml similarity index 100% rename from act/runner/testdata/environment-files-parser-bug/push.yaml rename to internal/act/runner/testdata/environment-files-parser-bug/push.yaml diff --git a/act/runner/testdata/environment-files/push.yaml b/internal/act/runner/testdata/environment-files/push.yaml similarity index 100% rename from act/runner/testdata/environment-files/push.yaml rename to internal/act/runner/testdata/environment-files/push.yaml diff --git a/act/runner/testdata/evalenv/push.yml b/internal/act/runner/testdata/evalenv/push.yml similarity index 100% rename from act/runner/testdata/evalenv/push.yml rename to internal/act/runner/testdata/evalenv/push.yml diff --git a/act/runner/testdata/evalmatrix-merge-array/push.yml b/internal/act/runner/testdata/evalmatrix-merge-array/push.yml similarity index 100% rename from act/runner/testdata/evalmatrix-merge-array/push.yml rename to internal/act/runner/testdata/evalmatrix-merge-array/push.yml diff --git a/act/runner/testdata/evalmatrix-merge-map/push.yml b/internal/act/runner/testdata/evalmatrix-merge-map/push.yml similarity index 100% rename from act/runner/testdata/evalmatrix-merge-map/push.yml rename to internal/act/runner/testdata/evalmatrix-merge-map/push.yml diff --git a/act/runner/testdata/evalmatrix/push.yml b/internal/act/runner/testdata/evalmatrix/push.yml similarity index 100% rename from act/runner/testdata/evalmatrix/push.yml rename to internal/act/runner/testdata/evalmatrix/push.yml diff --git a/act/runner/testdata/evalmatrixneeds/push.yml b/internal/act/runner/testdata/evalmatrixneeds/push.yml similarity index 100% rename from act/runner/testdata/evalmatrixneeds/push.yml rename to internal/act/runner/testdata/evalmatrixneeds/push.yml diff --git a/act/runner/testdata/evalmatrixneeds2/push.yml b/internal/act/runner/testdata/evalmatrixneeds2/push.yml similarity index 100% rename from act/runner/testdata/evalmatrixneeds2/push.yml rename to internal/act/runner/testdata/evalmatrixneeds2/push.yml diff --git a/act/runner/testdata/fail/push.yml b/internal/act/runner/testdata/fail/push.yml similarity index 100% rename from act/runner/testdata/fail/push.yml rename to internal/act/runner/testdata/fail/push.yml diff --git a/act/runner/testdata/if-env-act/push.yml b/internal/act/runner/testdata/if-env-act/push.yml similarity index 100% rename from act/runner/testdata/if-env-act/push.yml rename to internal/act/runner/testdata/if-env-act/push.yml diff --git a/act/runner/testdata/if-expressions/push.yml b/internal/act/runner/testdata/if-expressions/push.yml similarity index 100% rename from act/runner/testdata/if-expressions/push.yml rename to internal/act/runner/testdata/if-expressions/push.yml diff --git a/act/runner/testdata/input-from-cli/input.yml b/internal/act/runner/testdata/input-from-cli/input.yml similarity index 100% rename from act/runner/testdata/input-from-cli/input.yml rename to internal/act/runner/testdata/input-from-cli/input.yml diff --git a/act/runner/testdata/inputs-via-env-context/action.yml b/internal/act/runner/testdata/inputs-via-env-context/action.yml similarity index 100% rename from act/runner/testdata/inputs-via-env-context/action.yml rename to internal/act/runner/testdata/inputs-via-env-context/action.yml diff --git a/act/runner/testdata/inputs-via-env-context/push.yml b/internal/act/runner/testdata/inputs-via-env-context/push.yml similarity index 100% rename from act/runner/testdata/inputs-via-env-context/push.yml rename to internal/act/runner/testdata/inputs-via-env-context/push.yml diff --git a/act/runner/testdata/issue-1595/missing.yml b/internal/act/runner/testdata/issue-1595/missing.yml similarity index 100% rename from act/runner/testdata/issue-1595/missing.yml rename to internal/act/runner/testdata/issue-1595/missing.yml diff --git a/act/runner/testdata/issue-1595/no-event.yml b/internal/act/runner/testdata/issue-1595/no-event.yml similarity index 100% rename from act/runner/testdata/issue-1595/no-event.yml rename to internal/act/runner/testdata/issue-1595/no-event.yml diff --git a/act/runner/testdata/issue-1595/no-first.yml b/internal/act/runner/testdata/issue-1595/no-first.yml similarity index 100% rename from act/runner/testdata/issue-1595/no-first.yml rename to internal/act/runner/testdata/issue-1595/no-first.yml diff --git a/act/runner/testdata/issue-597/spelling.yaml b/internal/act/runner/testdata/issue-597/spelling.yaml similarity index 100% rename from act/runner/testdata/issue-597/spelling.yaml rename to internal/act/runner/testdata/issue-597/spelling.yaml diff --git a/act/runner/testdata/issue-598/spelling.yml b/internal/act/runner/testdata/issue-598/spelling.yml similarity index 100% rename from act/runner/testdata/issue-598/spelling.yml rename to internal/act/runner/testdata/issue-598/spelling.yml diff --git a/act/runner/testdata/job-container-invalid-credentials/push.yml b/internal/act/runner/testdata/job-container-invalid-credentials/push.yml similarity index 100% rename from act/runner/testdata/job-container-invalid-credentials/push.yml rename to internal/act/runner/testdata/job-container-invalid-credentials/push.yml diff --git a/act/runner/testdata/job-container-non-root/push.yml b/internal/act/runner/testdata/job-container-non-root/push.yml similarity index 100% rename from act/runner/testdata/job-container-non-root/push.yml rename to internal/act/runner/testdata/job-container-non-root/push.yml diff --git a/act/runner/testdata/job-container/push.yml b/internal/act/runner/testdata/job-container/push.yml similarity index 100% rename from act/runner/testdata/job-container/push.yml rename to internal/act/runner/testdata/job-container/push.yml diff --git a/act/runner/testdata/job-needs-context-contains-result/push.yml b/internal/act/runner/testdata/job-needs-context-contains-result/push.yml similarity index 100% rename from act/runner/testdata/job-needs-context-contains-result/push.yml rename to internal/act/runner/testdata/job-needs-context-contains-result/push.yml diff --git a/act/runner/testdata/job-nil-step/push.yml b/internal/act/runner/testdata/job-nil-step/push.yml similarity index 100% rename from act/runner/testdata/job-nil-step/push.yml rename to internal/act/runner/testdata/job-nil-step/push.yml diff --git a/act/runner/testdata/job-status-check/push.yml b/internal/act/runner/testdata/job-status-check/push.yml similarity index 100% rename from act/runner/testdata/job-status-check/push.yml rename to internal/act/runner/testdata/job-status-check/push.yml diff --git a/act/runner/testdata/local-action-docker-url/push.yml b/internal/act/runner/testdata/local-action-docker-url/push.yml similarity index 100% rename from act/runner/testdata/local-action-docker-url/push.yml rename to internal/act/runner/testdata/local-action-docker-url/push.yml diff --git a/act/runner/testdata/local-action-dockerfile/push.yml b/internal/act/runner/testdata/local-action-dockerfile/push.yml similarity index 100% rename from act/runner/testdata/local-action-dockerfile/push.yml rename to internal/act/runner/testdata/local-action-dockerfile/push.yml diff --git a/act/runner/testdata/local-action-js/push.yml b/internal/act/runner/testdata/local-action-js/push.yml similarity index 100% rename from act/runner/testdata/local-action-js/push.yml rename to internal/act/runner/testdata/local-action-js/push.yml diff --git a/act/runner/testdata/local-action-via-composite-dockerfile/action.yml b/internal/act/runner/testdata/local-action-via-composite-dockerfile/action.yml similarity index 100% rename from act/runner/testdata/local-action-via-composite-dockerfile/action.yml rename to internal/act/runner/testdata/local-action-via-composite-dockerfile/action.yml diff --git a/act/runner/testdata/local-action-via-composite-dockerfile/push.yml b/internal/act/runner/testdata/local-action-via-composite-dockerfile/push.yml similarity index 100% rename from act/runner/testdata/local-action-via-composite-dockerfile/push.yml rename to internal/act/runner/testdata/local-action-via-composite-dockerfile/push.yml diff --git a/act/runner/testdata/local-remote-action-overrides/config.yml b/internal/act/runner/testdata/local-remote-action-overrides/config.yml similarity index 100% rename from act/runner/testdata/local-remote-action-overrides/config.yml rename to internal/act/runner/testdata/local-remote-action-overrides/config.yml diff --git a/act/runner/testdata/local-remote-action-overrides/push.yml b/internal/act/runner/testdata/local-remote-action-overrides/push.yml similarity index 100% rename from act/runner/testdata/local-remote-action-overrides/push.yml rename to internal/act/runner/testdata/local-remote-action-overrides/push.yml diff --git a/act/runner/testdata/mask-values/composite/action.yml b/internal/act/runner/testdata/mask-values/composite/action.yml similarity index 100% rename from act/runner/testdata/mask-values/composite/action.yml rename to internal/act/runner/testdata/mask-values/composite/action.yml diff --git a/act/runner/testdata/mask-values/push.yml b/internal/act/runner/testdata/mask-values/push.yml similarity index 100% rename from act/runner/testdata/mask-values/push.yml rename to internal/act/runner/testdata/mask-values/push.yml diff --git a/act/runner/testdata/matrix-exitcode/push.yml b/internal/act/runner/testdata/matrix-exitcode/push.yml similarity index 100% rename from act/runner/testdata/matrix-exitcode/push.yml rename to internal/act/runner/testdata/matrix-exitcode/push.yml diff --git a/act/runner/testdata/matrix-with-user-inclusions/push.yml b/internal/act/runner/testdata/matrix-with-user-inclusions/push.yml similarity index 100% rename from act/runner/testdata/matrix-with-user-inclusions/push.yml rename to internal/act/runner/testdata/matrix-with-user-inclusions/push.yml diff --git a/act/runner/testdata/matrix/push.yml b/internal/act/runner/testdata/matrix/push.yml similarity index 100% rename from act/runner/testdata/matrix/push.yml rename to internal/act/runner/testdata/matrix/push.yml diff --git a/act/runner/testdata/networking/push.yml b/internal/act/runner/testdata/networking/push.yml similarity index 100% rename from act/runner/testdata/networking/push.yml rename to internal/act/runner/testdata/networking/push.yml diff --git a/act/runner/testdata/nix-prepend-path/push.yml b/internal/act/runner/testdata/nix-prepend-path/push.yml similarity index 100% rename from act/runner/testdata/nix-prepend-path/push.yml rename to internal/act/runner/testdata/nix-prepend-path/push.yml diff --git a/act/runner/testdata/no-panic-on-invalid-composite-action/push.yml b/internal/act/runner/testdata/no-panic-on-invalid-composite-action/push.yml similarity index 100% rename from act/runner/testdata/no-panic-on-invalid-composite-action/push.yml rename to internal/act/runner/testdata/no-panic-on-invalid-composite-action/push.yml diff --git a/act/runner/testdata/non-existent-action/push.yml b/internal/act/runner/testdata/non-existent-action/push.yml similarity index 100% rename from act/runner/testdata/non-existent-action/push.yml rename to internal/act/runner/testdata/non-existent-action/push.yml diff --git a/act/runner/testdata/outputs/push.yml b/internal/act/runner/testdata/outputs/push.yml similarity index 100% rename from act/runner/testdata/outputs/push.yml rename to internal/act/runner/testdata/outputs/push.yml diff --git a/act/runner/testdata/path-handling/action.yml b/internal/act/runner/testdata/path-handling/action.yml similarity index 100% rename from act/runner/testdata/path-handling/action.yml rename to internal/act/runner/testdata/path-handling/action.yml diff --git a/act/runner/testdata/path-handling/push.yml b/internal/act/runner/testdata/path-handling/push.yml similarity index 100% rename from act/runner/testdata/path-handling/push.yml rename to internal/act/runner/testdata/path-handling/push.yml diff --git a/act/runner/testdata/pull-request/event.json b/internal/act/runner/testdata/pull-request/event.json similarity index 100% rename from act/runner/testdata/pull-request/event.json rename to internal/act/runner/testdata/pull-request/event.json diff --git a/act/runner/testdata/pull-request/main.yaml b/internal/act/runner/testdata/pull-request/main.yaml similarity index 100% rename from act/runner/testdata/pull-request/main.yaml rename to internal/act/runner/testdata/pull-request/main.yaml diff --git a/act/runner/testdata/secrets/.env b/internal/act/runner/testdata/secrets/.env similarity index 100% rename from act/runner/testdata/secrets/.env rename to internal/act/runner/testdata/secrets/.env diff --git a/act/runner/testdata/secrets/.secrets b/internal/act/runner/testdata/secrets/.secrets similarity index 100% rename from act/runner/testdata/secrets/.secrets rename to internal/act/runner/testdata/secrets/.secrets diff --git a/act/runner/testdata/secrets/push.yml b/internal/act/runner/testdata/secrets/push.yml similarity index 100% rename from act/runner/testdata/secrets/push.yml rename to internal/act/runner/testdata/secrets/push.yml diff --git a/act/runner/testdata/services-empty-image/push.yml b/internal/act/runner/testdata/services-empty-image/push.yml similarity index 100% rename from act/runner/testdata/services-empty-image/push.yml rename to internal/act/runner/testdata/services-empty-image/push.yml diff --git a/act/runner/testdata/services-with-container/push.yml b/internal/act/runner/testdata/services-with-container/push.yml similarity index 100% rename from act/runner/testdata/services-with-container/push.yml rename to internal/act/runner/testdata/services-with-container/push.yml diff --git a/act/runner/testdata/services/push.yaml b/internal/act/runner/testdata/services/push.yaml similarity index 100% rename from act/runner/testdata/services/push.yaml rename to internal/act/runner/testdata/services/push.yaml diff --git a/act/runner/testdata/set-env-new-env-file-per-step/push.yml b/internal/act/runner/testdata/set-env-new-env-file-per-step/push.yml similarity index 100% rename from act/runner/testdata/set-env-new-env-file-per-step/push.yml rename to internal/act/runner/testdata/set-env-new-env-file-per-step/push.yml diff --git a/act/runner/testdata/set-env-step-env-override/push.yml b/internal/act/runner/testdata/set-env-step-env-override/push.yml similarity index 100% rename from act/runner/testdata/set-env-step-env-override/push.yml rename to internal/act/runner/testdata/set-env-step-env-override/push.yml diff --git a/act/runner/testdata/shells/bash/push.yml b/internal/act/runner/testdata/shells/bash/push.yml similarity index 100% rename from act/runner/testdata/shells/bash/push.yml rename to internal/act/runner/testdata/shells/bash/push.yml diff --git a/act/runner/testdata/shells/defaults/push.yml b/internal/act/runner/testdata/shells/defaults/push.yml similarity index 100% rename from act/runner/testdata/shells/defaults/push.yml rename to internal/act/runner/testdata/shells/defaults/push.yml diff --git a/act/runner/testdata/shells/pwsh/push.yml b/internal/act/runner/testdata/shells/pwsh/push.yml similarity index 100% rename from act/runner/testdata/shells/pwsh/push.yml rename to internal/act/runner/testdata/shells/pwsh/push.yml diff --git a/act/runner/testdata/shells/sh/push.yml b/internal/act/runner/testdata/shells/sh/push.yml similarity index 100% rename from act/runner/testdata/shells/sh/push.yml rename to internal/act/runner/testdata/shells/sh/push.yml diff --git a/act/runner/testdata/steps-context/conclusion/push.yml b/internal/act/runner/testdata/steps-context/conclusion/push.yml similarity index 100% rename from act/runner/testdata/steps-context/conclusion/push.yml rename to internal/act/runner/testdata/steps-context/conclusion/push.yml diff --git a/act/runner/testdata/steps-context/outcome/push.yml b/internal/act/runner/testdata/steps-context/outcome/push.yml similarity index 100% rename from act/runner/testdata/steps-context/outcome/push.yml rename to internal/act/runner/testdata/steps-context/outcome/push.yml diff --git a/act/runner/testdata/uses-and-run-in-one-step/push.yml b/internal/act/runner/testdata/uses-and-run-in-one-step/push.yml similarity index 100% rename from act/runner/testdata/uses-and-run-in-one-step/push.yml rename to internal/act/runner/testdata/uses-and-run-in-one-step/push.yml diff --git a/act/runner/testdata/uses-composite-with-error/composite_action2/action.yml b/internal/act/runner/testdata/uses-composite-with-error/composite_action2/action.yml similarity index 100% rename from act/runner/testdata/uses-composite-with-error/composite_action2/action.yml rename to internal/act/runner/testdata/uses-composite-with-error/composite_action2/action.yml diff --git a/act/runner/testdata/uses-composite-with-error/push.yml b/internal/act/runner/testdata/uses-composite-with-error/push.yml similarity index 100% rename from act/runner/testdata/uses-composite-with-error/push.yml rename to internal/act/runner/testdata/uses-composite-with-error/push.yml diff --git a/act/runner/testdata/uses-composite/composite_action/action.yml b/internal/act/runner/testdata/uses-composite/composite_action/action.yml similarity index 100% rename from act/runner/testdata/uses-composite/composite_action/action.yml rename to internal/act/runner/testdata/uses-composite/composite_action/action.yml diff --git a/act/runner/testdata/uses-composite/push.yml b/internal/act/runner/testdata/uses-composite/push.yml similarity index 100% rename from act/runner/testdata/uses-composite/push.yml rename to internal/act/runner/testdata/uses-composite/push.yml diff --git a/act/runner/testdata/uses-docker-url/push.yml b/internal/act/runner/testdata/uses-docker-url/push.yml similarity index 100% rename from act/runner/testdata/uses-docker-url/push.yml rename to internal/act/runner/testdata/uses-docker-url/push.yml diff --git a/act/runner/testdata/uses-github-empty/push.yml b/internal/act/runner/testdata/uses-github-empty/push.yml similarity index 100% rename from act/runner/testdata/uses-github-empty/push.yml rename to internal/act/runner/testdata/uses-github-empty/push.yml diff --git a/act/runner/testdata/uses-github-noref/push.yml b/internal/act/runner/testdata/uses-github-noref/push.yml similarity index 100% rename from act/runner/testdata/uses-github-noref/push.yml rename to internal/act/runner/testdata/uses-github-noref/push.yml diff --git a/act/runner/testdata/uses-github-root/push.yml b/internal/act/runner/testdata/uses-github-root/push.yml similarity index 100% rename from act/runner/testdata/uses-github-root/push.yml rename to internal/act/runner/testdata/uses-github-root/push.yml diff --git a/act/runner/testdata/uses-workflow/push.yml b/internal/act/runner/testdata/uses-workflow/push.yml similarity index 100% rename from act/runner/testdata/uses-workflow/push.yml rename to internal/act/runner/testdata/uses-workflow/push.yml diff --git a/act/runner/testdata/windows-add-env/action.yml b/internal/act/runner/testdata/windows-add-env/action.yml similarity index 100% rename from act/runner/testdata/windows-add-env/action.yml rename to internal/act/runner/testdata/windows-add-env/action.yml diff --git a/act/runner/testdata/windows-add-env/push.yml b/internal/act/runner/testdata/windows-add-env/push.yml similarity index 100% rename from act/runner/testdata/windows-add-env/push.yml rename to internal/act/runner/testdata/windows-add-env/push.yml diff --git a/act/runner/testdata/windows-prepend-path/push.yml b/internal/act/runner/testdata/windows-prepend-path/push.yml similarity index 100% rename from act/runner/testdata/windows-prepend-path/push.yml rename to internal/act/runner/testdata/windows-prepend-path/push.yml diff --git a/act/runner/testdata/windows-shell-cmd/push.yml b/internal/act/runner/testdata/windows-shell-cmd/push.yml similarity index 100% rename from act/runner/testdata/windows-shell-cmd/push.yml rename to internal/act/runner/testdata/windows-shell-cmd/push.yml diff --git a/act/runner/testdata/workdir/canary b/internal/act/runner/testdata/workdir/canary similarity index 100% rename from act/runner/testdata/workdir/canary rename to internal/act/runner/testdata/workdir/canary diff --git a/act/runner/testdata/workdir/canary-link b/internal/act/runner/testdata/workdir/canary-link similarity index 100% rename from act/runner/testdata/workdir/canary-link rename to internal/act/runner/testdata/workdir/canary-link diff --git a/act/runner/testdata/workdir/push.yml b/internal/act/runner/testdata/workdir/push.yml similarity index 100% rename from act/runner/testdata/workdir/push.yml rename to internal/act/runner/testdata/workdir/push.yml diff --git a/act/runner/testdata/workflow_call_inputs/event.json b/internal/act/runner/testdata/workflow_call_inputs/event.json similarity index 100% rename from act/runner/testdata/workflow_call_inputs/event.json rename to internal/act/runner/testdata/workflow_call_inputs/event.json diff --git a/act/runner/testdata/workflow_call_inputs/workflow_call_inputs.yml b/internal/act/runner/testdata/workflow_call_inputs/workflow_call_inputs.yml similarity index 100% rename from act/runner/testdata/workflow_call_inputs/workflow_call_inputs.yml rename to internal/act/runner/testdata/workflow_call_inputs/workflow_call_inputs.yml diff --git a/act/runner/testdata/workflow_dispatch-scalar-composite-action/workflow_dispatch.yml b/internal/act/runner/testdata/workflow_dispatch-scalar-composite-action/workflow_dispatch.yml similarity index 100% rename from act/runner/testdata/workflow_dispatch-scalar-composite-action/workflow_dispatch.yml rename to internal/act/runner/testdata/workflow_dispatch-scalar-composite-action/workflow_dispatch.yml diff --git a/act/runner/testdata/workflow_dispatch-scalar/workflow_dispatch.yml b/internal/act/runner/testdata/workflow_dispatch-scalar/workflow_dispatch.yml similarity index 100% rename from act/runner/testdata/workflow_dispatch-scalar/workflow_dispatch.yml rename to internal/act/runner/testdata/workflow_dispatch-scalar/workflow_dispatch.yml diff --git a/act/runner/testdata/workflow_dispatch/event.json b/internal/act/runner/testdata/workflow_dispatch/event.json similarity index 100% rename from act/runner/testdata/workflow_dispatch/event.json rename to internal/act/runner/testdata/workflow_dispatch/event.json diff --git a/act/runner/testdata/workflow_dispatch/workflow_dispatch.yml b/internal/act/runner/testdata/workflow_dispatch/workflow_dispatch.yml similarity index 100% rename from act/runner/testdata/workflow_dispatch/workflow_dispatch.yml rename to internal/act/runner/testdata/workflow_dispatch/workflow_dispatch.yml diff --git a/act/runner/testdata/workflow_dispatch_no_inputs_mapping/workflow_dispatch.yml b/internal/act/runner/testdata/workflow_dispatch_no_inputs_mapping/workflow_dispatch.yml similarity index 100% rename from act/runner/testdata/workflow_dispatch_no_inputs_mapping/workflow_dispatch.yml rename to internal/act/runner/testdata/workflow_dispatch_no_inputs_mapping/workflow_dispatch.yml diff --git a/act/runner/toolkit_patch.go b/internal/act/runner/toolkit_patch.go similarity index 99% rename from act/runner/toolkit_patch.go rename to internal/act/runner/toolkit_patch.go index 6f9b2b49..a4f4b521 100644 --- a/act/runner/toolkit_patch.go +++ b/internal/act/runner/toolkit_patch.go @@ -11,8 +11,8 @@ import ( "regexp" "strings" - "gitea.com/gitea/runner/act/common" - "gitea.com/gitea/runner/act/common/git" + "gitea.com/gitea/runner/internal/act/common" + "gitea.com/gitea/runner/internal/act/common/git" "gitea.dev/actionslib/pkg/model" ) diff --git a/act/runner/toolkit_patch_e2e_test.go b/internal/act/runner/toolkit_patch_e2e_test.go similarity index 99% rename from act/runner/toolkit_patch_e2e_test.go rename to internal/act/runner/toolkit_patch_e2e_test.go index c77cb43b..edb0dfa5 100644 --- a/act/runner/toolkit_patch_e2e_test.go +++ b/internal/act/runner/toolkit_patch_e2e_test.go @@ -18,7 +18,7 @@ import ( "testing" "time" - "gitea.com/gitea/runner/act/artifactcache" + "gitea.com/gitea/runner/internal/act/artifactcache" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/act/runner/toolkit_patch_test.go b/internal/act/runner/toolkit_patch_test.go similarity index 100% rename from act/runner/toolkit_patch_test.go rename to internal/act/runner/toolkit_patch_test.go diff --git a/internal/app/cmd/cache-server.go b/internal/app/cmd/cache-server.go index 1d63da05..c069a13c 100644 --- a/internal/app/cmd/cache-server.go +++ b/internal/app/cmd/cache-server.go @@ -9,7 +9,7 @@ import ( "os" "os/signal" - "gitea.com/gitea/runner/act/artifactcache" + "gitea.com/gitea/runner/internal/act/artifactcache" "gitea.com/gitea/runner/internal/pkg/config" log "github.com/sirupsen/logrus" diff --git a/internal/app/cmd/exec.go b/internal/app/cmd/exec.go index 3c678298..681807e7 100644 --- a/internal/app/cmd/exec.go +++ b/internal/app/cmd/exec.go @@ -17,10 +17,10 @@ import ( "strings" "time" - "gitea.com/gitea/runner/act/artifactcache" - "gitea.com/gitea/runner/act/artifacts" - "gitea.com/gitea/runner/act/common" - "gitea.com/gitea/runner/act/runner" + "gitea.com/gitea/runner/internal/act/artifactcache" + "gitea.com/gitea/runner/internal/act/artifacts" + "gitea.com/gitea/runner/internal/act/common" + "gitea.com/gitea/runner/internal/act/runner" "gitea.com/gitea/runner/internal/app/run" "gitea.dev/actionslib/pkg/model" diff --git a/internal/app/run/health_check.go b/internal/app/run/health_check.go index 5b00ee50..c86a21c6 100644 --- a/internal/app/run/health_check.go +++ b/internal/app/run/health_check.go @@ -14,7 +14,7 @@ import ( "strings" "time" - "gitea.com/gitea/runner/act/common" + "gitea.com/gitea/runner/internal/act/common" "gitea.com/gitea/runner/internal/pkg/process" ) diff --git a/internal/app/run/post_task_script.go b/internal/app/run/post_task_script.go index 6b054ee0..991bbb2d 100644 --- a/internal/app/run/post_task_script.go +++ b/internal/app/run/post_task_script.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "gitea.com/gitea/runner/act/common" + "gitea.com/gitea/runner/internal/act/common" "gitea.com/gitea/runner/internal/pkg/config" "gitea.com/gitea/runner/internal/pkg/metrics" "gitea.com/gitea/runner/internal/pkg/process" diff --git a/internal/app/run/proxy.go b/internal/app/run/proxy.go index 125458bb..ad15d598 100644 --- a/internal/app/run/proxy.go +++ b/internal/app/run/proxy.go @@ -10,7 +10,7 @@ import ( "slices" "strings" - "gitea.com/gitea/runner/act/container" + "gitea.com/gitea/runner/internal/act/container" log "github.com/sirupsen/logrus" "golang.org/x/net/http/httpproxy" diff --git a/internal/app/run/runner.go b/internal/app/run/runner.go index 12a6ea9b..25f05777 100644 --- a/internal/app/run/runner.go +++ b/internal/app/run/runner.go @@ -21,10 +21,10 @@ import ( "sync/atomic" "time" - "gitea.com/gitea/runner/act/artifactcache" - "gitea.com/gitea/runner/act/common" - "gitea.com/gitea/runner/act/container" - "gitea.com/gitea/runner/act/runner" + "gitea.com/gitea/runner/internal/act/artifactcache" + "gitea.com/gitea/runner/internal/act/common" + "gitea.com/gitea/runner/internal/act/container" + "gitea.com/gitea/runner/internal/act/runner" "gitea.com/gitea/runner/internal/pkg/client" "gitea.com/gitea/runner/internal/pkg/config" "gitea.com/gitea/runner/internal/pkg/labels" diff --git a/internal/app/run/runner_cache_test.go b/internal/app/run/runner_cache_test.go index 083728b1..ce7e19ad 100644 --- a/internal/app/run/runner_cache_test.go +++ b/internal/app/run/runner_cache_test.go @@ -14,7 +14,7 @@ import ( "strings" "testing" - "gitea.com/gitea/runner/act/artifactcache" + "gitea.com/gitea/runner/internal/act/artifactcache" "gitea.com/gitea/runner/internal/pkg/config" "github.com/stretchr/testify/assert" diff --git a/internal/app/run/runner_test.go b/internal/app/run/runner_test.go index 79f7d34f..7f86a921 100644 --- a/internal/app/run/runner_test.go +++ b/internal/app/run/runner_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "gitea.com/gitea/runner/act/runner" + "gitea.com/gitea/runner/internal/act/runner" clientmocks "gitea.com/gitea/runner/internal/pkg/client/mocks" "gitea.com/gitea/runner/internal/pkg/config" "gitea.com/gitea/runner/internal/pkg/ver" diff --git a/internal/pkg/report/reporter.go b/internal/pkg/report/reporter.go index ecfe3c71..48913cea 100644 --- a/internal/pkg/report/reporter.go +++ b/internal/pkg/report/reporter.go @@ -13,7 +13,7 @@ import ( "sync/atomic" "time" - "gitea.com/gitea/runner/act/runner" + "gitea.com/gitea/runner/internal/act/runner" "gitea.com/gitea/runner/internal/pkg/client" "gitea.com/gitea/runner/internal/pkg/config" "gitea.com/gitea/runner/internal/pkg/metrics" diff --git a/internal/pkg/report/reporter_test.go b/internal/pkg/report/reporter_test.go index 8f91fddc..4a2958ac 100644 --- a/internal/pkg/report/reporter_test.go +++ b/internal/pkg/report/reporter_test.go @@ -16,7 +16,7 @@ import ( "testing" "time" - "gitea.com/gitea/runner/act/runner" + "gitea.com/gitea/runner/internal/act/runner" "gitea.com/gitea/runner/internal/pkg/client/mocks" "gitea.com/gitea/runner/internal/pkg/config"