From ec99579451b7b44cfd2ad01e48a006cd903dedf7 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Thu, 31 Jul 2025 10:35:11 +0000 Subject: [PATCH] chore: to allow the runner to be imported, v9 needs to be in the go module (#777) It will be imported by Forgejo. - other - [PR](https://code.forgejo.org/forgejo/runner/pulls/777): chore: to allow the runner to be imported, v9 needs to be in the go module Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/777 Reviewed-by: Michael Kriese Co-authored-by: Earl Warren Co-committed-by: Earl Warren --- Makefile | 4 ++-- act/artifactcache/handler.go | 4 ++-- act/artifactcache/mac.go | 2 +- act/artifactcache/mac_test.go | 2 +- act/cacheproxy/handler.go | 2 +- act/common/git/git.go | 2 +- act/common/git/git_test.go | 2 +- act/container/container_types.go | 2 +- act/container/docker_auth.go | 2 +- act/container/docker_build.go | 2 +- act/container/docker_network.go | 2 +- act/container/docker_pull.go | 2 +- act/container/docker_run.go | 4 ++-- act/container/docker_run_test.go | 2 +- act/container/docker_stub.go | 2 +- act/container/docker_volume.go | 2 +- act/container/host_environment.go | 6 +++--- act/container/parse_env_file.go | 2 +- act/exprparser/functions.go | 2 +- act/exprparser/functions_test.go | 2 +- act/exprparser/interpreter.go | 2 +- act/exprparser/interpreter_test.go | 2 +- act/jobparser/evaluator.go | 2 +- act/jobparser/interpeter.go | 4 ++-- act/jobparser/jobparser.go | 2 +- act/jobparser/model.go | 2 +- act/jobparser/model_test.go | 2 +- act/jobparser/testdata_test.go | 2 +- act/model/action.go | 2 +- act/model/github_context.go | 4 ++-- act/model/workflow.go | 4 ++-- act/runner/action.go | 6 +++--- act/runner/action_cache.go | 2 +- act/runner/action_composite.go | 4 ++-- act/runner/action_test.go | 2 +- act/runner/command.go | 2 +- act/runner/command_test.go | 4 ++-- act/runner/container_mock_test.go | 4 ++-- act/runner/expression.go | 8 ++++---- act/runner/expression_test.go | 4 ++-- act/runner/job_executor.go | 6 +++--- act/runner/job_executor_test.go | 6 +++--- act/runner/local_repository_cache.go | 2 +- act/runner/logger.go | 2 +- act/runner/reusable_workflow.go | 6 +++--- act/runner/run_context.go | 8 ++++---- act/runner/run_context_test.go | 8 ++++---- act/runner/runner.go | 4 ++-- act/runner/runner_test.go | 4 ++-- act/runner/step.go | 8 ++++---- act/runner/step_action_local.go | 4 ++-- act/runner/step_action_local_test.go | 4 ++-- act/runner/step_action_remote.go | 6 +++--- act/runner/step_action_remote_test.go | 6 +++--- act/runner/step_docker.go | 6 +++--- act/runner/step_docker_test.go | 4 ++-- act/runner/step_factory.go | 2 +- act/runner/step_factory_test.go | 2 +- act/runner/step_run.go | 8 ++++---- act/runner/step_run_test.go | 4 ++-- act/runner/step_test.go | 4 ++-- go.mod | 2 +- internal/app/cmd/cache-server.go | 4 ++-- internal/app/cmd/cmd.go | 4 ++-- internal/app/cmd/create-runner-file.go | 8 ++++---- internal/app/cmd/create-runner-file_test.go | 6 +++--- internal/app/cmd/daemon.go | 14 +++++++------- internal/app/cmd/exec.go | 8 ++++---- internal/app/cmd/job.go | 14 +++++++------- internal/app/cmd/main_test.go | 2 +- internal/app/cmd/register.go | 8 ++++---- internal/app/cmd/validate.go | 4 ++-- internal/app/job/job.go | 6 +++--- internal/app/job/job_test.go | 2 +- internal/app/poll/poller.go | 6 +++--- internal/app/poll/poller_test.go | 2 +- internal/app/run/runner.go | 20 ++++++++++---------- internal/app/run/runner_test.go | 2 +- internal/app/run/workflow.go | 2 +- internal/app/run/workflow_test.go | 2 +- internal/pkg/report/reporter.go | 2 +- internal/pkg/report/reporter_test.go | 4 ++-- internal/pkg/ver/version.go | 2 +- main.go | 2 +- 84 files changed, 172 insertions(+), 172 deletions(-) diff --git a/Makefile b/Makefile index 50e12958..6b728dad 100644 --- a/Makefile +++ b/Makefile @@ -62,10 +62,10 @@ else endif endif -GO_PACKAGES_TO_VET ?= $(filter-out code.forgejo.org/forgejo/runner/internal/pkg/client/mocks,$(shell $(GO) list ./...)) +GO_PACKAGES_TO_VET ?= $(filter-out code.forgejo.org/forgejo/runner/v9/internal/pkg/client/mocks,$(shell $(GO) list ./...)) TAGS ?= -LDFLAGS ?= -X "code.forgejo.org/forgejo/runner/internal/pkg/ver.version=v$(RELEASE_VERSION)" +LDFLAGS ?= -X "code.forgejo.org/forgejo/runner/v9/internal/pkg/ver.version=v$(RELEASE_VERSION)" all: build diff --git a/act/artifactcache/handler.go b/act/artifactcache/handler.go index 2d62abaf..b50b6b11 100644 --- a/act/artifactcache/handler.go +++ b/act/artifactcache/handler.go @@ -20,8 +20,8 @@ import ( "github.com/timshannon/bolthold" "go.etcd.io/bbolt" - "code.forgejo.org/forgejo/runner/act/cacheproxy" - "code.forgejo.org/forgejo/runner/act/common" + "code.forgejo.org/forgejo/runner/v9/act/cacheproxy" + "code.forgejo.org/forgejo/runner/v9/act/common" ) const ( diff --git a/act/artifactcache/mac.go b/act/artifactcache/mac.go index 8a1d7a3a..6ed20b01 100644 --- a/act/artifactcache/mac.go +++ b/act/artifactcache/mac.go @@ -11,7 +11,7 @@ import ( "strconv" "time" - "code.forgejo.org/forgejo/runner/act/cacheproxy" + "code.forgejo.org/forgejo/runner/v9/act/cacheproxy" ) var ErrValidation = errors.New("validation error") diff --git a/act/artifactcache/mac_test.go b/act/artifactcache/mac_test.go index 17531ec6..a4b801a9 100644 --- a/act/artifactcache/mac_test.go +++ b/act/artifactcache/mac_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "code.forgejo.org/forgejo/runner/act/cacheproxy" + "code.forgejo.org/forgejo/runner/v9/act/cacheproxy" "github.com/stretchr/testify/require" ) diff --git a/act/cacheproxy/handler.go b/act/cacheproxy/handler.go index dddee822..79d3f14b 100644 --- a/act/cacheproxy/handler.go +++ b/act/cacheproxy/handler.go @@ -22,7 +22,7 @@ import ( "github.com/julienschmidt/httprouter" "github.com/sirupsen/logrus" - "code.forgejo.org/forgejo/runner/act/common" + "code.forgejo.org/forgejo/runner/v9/act/common" ) const ( diff --git a/act/common/git/git.go b/act/common/git/git.go index e86ca63e..1748e797 100644 --- a/act/common/git/git.go +++ b/act/common/git/git.go @@ -19,7 +19,7 @@ import ( "github.com/mattn/go-isatty" log "github.com/sirupsen/logrus" - "code.forgejo.org/forgejo/runner/act/common" + "code.forgejo.org/forgejo/runner/v9/act/common" ) var ( diff --git a/act/common/git/git_test.go b/act/common/git/git_test.go index 445ee062..f03720e9 100644 --- a/act/common/git/git_test.go +++ b/act/common/git/git_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "code.forgejo.org/forgejo/runner/act/common" + "code.forgejo.org/forgejo/runner/v9/act/common" ) func TestFindGitSlug(t *testing.T) { diff --git a/act/container/container_types.go b/act/container/container_types.go index e077c45e..3d3a5162 100644 --- a/act/container/container_types.go +++ b/act/container/container_types.go @@ -4,7 +4,7 @@ import ( "context" "io" - "code.forgejo.org/forgejo/runner/act/common" + "code.forgejo.org/forgejo/runner/v9/act/common" "github.com/docker/go-connections/nat" ) diff --git a/act/container/docker_auth.go b/act/container/docker_auth.go index e76fd182..01b0c816 100644 --- a/act/container/docker_auth.go +++ b/act/container/docker_auth.go @@ -6,7 +6,7 @@ import ( "context" "strings" - "code.forgejo.org/forgejo/runner/act/common" + "code.forgejo.org/forgejo/runner/v9/act/common" "github.com/docker/cli/cli/config" "github.com/docker/cli/cli/config/credentials" "github.com/docker/docker/api/types/registry" diff --git a/act/container/docker_build.go b/act/container/docker_build.go index e88d226b..7b8dd906 100644 --- a/act/container/docker_build.go +++ b/act/container/docker_build.go @@ -14,7 +14,7 @@ import ( "github.com/moby/patternmatcher" "github.com/moby/patternmatcher/ignorefile" - "code.forgejo.org/forgejo/runner/act/common" + "code.forgejo.org/forgejo/runner/v9/act/common" ) // NewDockerBuildExecutor function to create a run executor for the container diff --git a/act/container/docker_network.go b/act/container/docker_network.go index 29e936e1..23d884f6 100644 --- a/act/container/docker_network.go +++ b/act/container/docker_network.go @@ -5,7 +5,7 @@ package container import ( "context" - "code.forgejo.org/forgejo/runner/act/common" + "code.forgejo.org/forgejo/runner/v9/act/common" "github.com/docker/docker/api/types/network" ) diff --git a/act/container/docker_pull.go b/act/container/docker_pull.go index 53c084a0..3b1ad5c7 100644 --- a/act/container/docker_pull.go +++ b/act/container/docker_pull.go @@ -13,7 +13,7 @@ import ( "github.com/docker/docker/api/types/image" "github.com/docker/docker/api/types/registry" - "code.forgejo.org/forgejo/runner/act/common" + "code.forgejo.org/forgejo/runner/v9/act/common" ) // NewDockerPullExecutor function to create a run executor for the container diff --git a/act/container/docker_run.go b/act/container/docker_run.go index a954fc63..73672325 100644 --- a/act/container/docker_run.go +++ b/act/container/docker_run.go @@ -37,8 +37,8 @@ import ( "github.com/spf13/pflag" "golang.org/x/term" - "code.forgejo.org/forgejo/runner/act/common" - "code.forgejo.org/forgejo/runner/act/filecollector" + "code.forgejo.org/forgejo/runner/v9/act/common" + "code.forgejo.org/forgejo/runner/v9/act/filecollector" ) // NewContainer creates a reference to a container diff --git a/act/container/docker_run_test.go b/act/container/docker_run_test.go index d5c52656..53a812f6 100644 --- a/act/container/docker_run_test.go +++ b/act/container/docker_run_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "code.forgejo.org/forgejo/runner/act/common" + "code.forgejo.org/forgejo/runner/v9/act/common" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" diff --git a/act/container/docker_stub.go b/act/container/docker_stub.go index 12baf137..2f3624fd 100644 --- a/act/container/docker_stub.go +++ b/act/container/docker_stub.go @@ -6,7 +6,7 @@ import ( "context" "runtime" - "code.forgejo.org/forgejo/runner/act/common" + "code.forgejo.org/forgejo/runner/v9/act/common" "github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/system" "github.com/pkg/errors" diff --git a/act/container/docker_volume.go b/act/container/docker_volume.go index 2e7c54eb..94e4036b 100644 --- a/act/container/docker_volume.go +++ b/act/container/docker_volume.go @@ -5,7 +5,7 @@ package container import ( "context" - "code.forgejo.org/forgejo/runner/act/common" + "code.forgejo.org/forgejo/runner/v9/act/common" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/volume" ) diff --git a/act/container/host_environment.go b/act/container/host_environment.go index 5940b434..045d7774 100644 --- a/act/container/host_environment.go +++ b/act/container/host_environment.go @@ -20,9 +20,9 @@ import ( "github.com/go-git/go-git/v5/plumbing/format/gitignore" "golang.org/x/term" - "code.forgejo.org/forgejo/runner/act/common" - "code.forgejo.org/forgejo/runner/act/filecollector" - "code.forgejo.org/forgejo/runner/act/lookpath" + "code.forgejo.org/forgejo/runner/v9/act/common" + "code.forgejo.org/forgejo/runner/v9/act/filecollector" + "code.forgejo.org/forgejo/runner/v9/act/lookpath" ) type HostEnvironment struct { diff --git a/act/container/parse_env_file.go b/act/container/parse_env_file.go index 606a33ae..227facb4 100644 --- a/act/container/parse_env_file.go +++ b/act/container/parse_env_file.go @@ -8,7 +8,7 @@ import ( "io" "strings" - "code.forgejo.org/forgejo/runner/act/common" + "code.forgejo.org/forgejo/runner/v9/act/common" ) func parseEnvFile(e Container, srcPath string, env *map[string]string) common.Executor { diff --git a/act/exprparser/functions.go b/act/exprparser/functions.go index 49827ecf..297df879 100644 --- a/act/exprparser/functions.go +++ b/act/exprparser/functions.go @@ -15,7 +15,7 @@ import ( "github.com/go-git/go-git/v5/plumbing/format/gitignore" - "code.forgejo.org/forgejo/runner/act/model" + "code.forgejo.org/forgejo/runner/v9/act/model" "github.com/rhysd/actionlint" ) diff --git a/act/exprparser/functions_test.go b/act/exprparser/functions_test.go index 3560cf3d..e8525efa 100644 --- a/act/exprparser/functions_test.go +++ b/act/exprparser/functions_test.go @@ -4,7 +4,7 @@ import ( "path/filepath" "testing" - "code.forgejo.org/forgejo/runner/act/model" + "code.forgejo.org/forgejo/runner/v9/act/model" "github.com/stretchr/testify/assert" ) diff --git a/act/exprparser/interpreter.go b/act/exprparser/interpreter.go index 9a5386fe..202ade22 100644 --- a/act/exprparser/interpreter.go +++ b/act/exprparser/interpreter.go @@ -7,7 +7,7 @@ import ( "reflect" "strings" - "code.forgejo.org/forgejo/runner/act/model" + "code.forgejo.org/forgejo/runner/v9/act/model" "github.com/rhysd/actionlint" ) diff --git a/act/exprparser/interpreter_test.go b/act/exprparser/interpreter_test.go index d2f27413..4a7741fa 100644 --- a/act/exprparser/interpreter_test.go +++ b/act/exprparser/interpreter_test.go @@ -4,7 +4,7 @@ import ( "math" "testing" - "code.forgejo.org/forgejo/runner/act/model" + "code.forgejo.org/forgejo/runner/v9/act/model" "github.com/stretchr/testify/assert" ) diff --git a/act/jobparser/evaluator.go b/act/jobparser/evaluator.go index 7c5243da..16f520b1 100644 --- a/act/jobparser/evaluator.go +++ b/act/jobparser/evaluator.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - "code.forgejo.org/forgejo/runner/act/exprparser" + "code.forgejo.org/forgejo/runner/v9/act/exprparser" "gopkg.in/yaml.v3" ) diff --git a/act/jobparser/interpeter.go b/act/jobparser/interpeter.go index 6a634ceb..f798121a 100644 --- a/act/jobparser/interpeter.go +++ b/act/jobparser/interpeter.go @@ -1,8 +1,8 @@ package jobparser import ( - "code.forgejo.org/forgejo/runner/act/exprparser" - "code.forgejo.org/forgejo/runner/act/model" + "code.forgejo.org/forgejo/runner/v9/act/exprparser" + "code.forgejo.org/forgejo/runner/v9/act/model" "gopkg.in/yaml.v3" ) diff --git a/act/jobparser/jobparser.go b/act/jobparser/jobparser.go index f958197b..0fd1768e 100644 --- a/act/jobparser/jobparser.go +++ b/act/jobparser/jobparser.go @@ -8,7 +8,7 @@ import ( "gopkg.in/yaml.v3" - "code.forgejo.org/forgejo/runner/act/model" + "code.forgejo.org/forgejo/runner/v9/act/model" ) func Parse(content []byte, validate bool, options ...ParseOption) ([]*SingleWorkflow, error) { diff --git a/act/jobparser/model.go b/act/jobparser/model.go index 00c4789b..ac1d871d 100644 --- a/act/jobparser/model.go +++ b/act/jobparser/model.go @@ -3,7 +3,7 @@ package jobparser import ( "fmt" - "code.forgejo.org/forgejo/runner/act/model" + "code.forgejo.org/forgejo/runner/v9/act/model" "gopkg.in/yaml.v3" ) diff --git a/act/jobparser/model_test.go b/act/jobparser/model_test.go index 78163d18..30dc4890 100644 --- a/act/jobparser/model_test.go +++ b/act/jobparser/model_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "code.forgejo.org/forgejo/runner/act/model" + "code.forgejo.org/forgejo/runner/v9/act/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/act/jobparser/testdata_test.go b/act/jobparser/testdata_test.go index 4394a396..dfbf2f76 100644 --- a/act/jobparser/testdata_test.go +++ b/act/jobparser/testdata_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "testing" - "code.forgejo.org/forgejo/runner/act/model" + "code.forgejo.org/forgejo/runner/v9/act/model" "github.com/stretchr/testify/require" ) diff --git a/act/model/action.go b/act/model/action.go index c0ddb2b1..62b1d025 100644 --- a/act/model/action.go +++ b/act/model/action.go @@ -5,7 +5,7 @@ import ( "io" "strings" - "code.forgejo.org/forgejo/runner/act/schema" + "code.forgejo.org/forgejo/runner/v9/act/schema" "gopkg.in/yaml.v3" ) diff --git a/act/model/github_context.go b/act/model/github_context.go index 931ca928..e7c8809e 100644 --- a/act/model/github_context.go +++ b/act/model/github_context.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "code.forgejo.org/forgejo/runner/act/common" - "code.forgejo.org/forgejo/runner/act/common/git" + "code.forgejo.org/forgejo/runner/v9/act/common" + "code.forgejo.org/forgejo/runner/v9/act/common/git" ) type GithubContext struct { diff --git a/act/model/workflow.go b/act/model/workflow.go index 826d371d..ab6ad296 100644 --- a/act/model/workflow.go +++ b/act/model/workflow.go @@ -10,8 +10,8 @@ import ( "strconv" "strings" - "code.forgejo.org/forgejo/runner/act/common" - "code.forgejo.org/forgejo/runner/act/schema" + "code.forgejo.org/forgejo/runner/v9/act/common" + "code.forgejo.org/forgejo/runner/v9/act/schema" log "github.com/sirupsen/logrus" "gopkg.in/yaml.v3" ) diff --git a/act/runner/action.go b/act/runner/action.go index c272d64e..16961cd3 100644 --- a/act/runner/action.go +++ b/act/runner/action.go @@ -16,9 +16,9 @@ import ( "github.com/kballard/go-shellquote" - "code.forgejo.org/forgejo/runner/act/common" - "code.forgejo.org/forgejo/runner/act/container" - "code.forgejo.org/forgejo/runner/act/model" + "code.forgejo.org/forgejo/runner/v9/act/common" + "code.forgejo.org/forgejo/runner/v9/act/container" + "code.forgejo.org/forgejo/runner/v9/act/model" ) type actionStep interface { diff --git a/act/runner/action_cache.go b/act/runner/action_cache.go index f531548e..219656cf 100644 --- a/act/runner/action_cache.go +++ b/act/runner/action_cache.go @@ -18,7 +18,7 @@ import ( "github.com/go-git/go-git/v5/plumbing/transport" "github.com/go-git/go-git/v5/plumbing/transport/http" - "code.forgejo.org/forgejo/runner/act/common" + "code.forgejo.org/forgejo/runner/v9/act/common" ) type ActionCache interface { diff --git a/act/runner/action_composite.go b/act/runner/action_composite.go index 7882b186..fdee793d 100644 --- a/act/runner/action_composite.go +++ b/act/runner/action_composite.go @@ -6,8 +6,8 @@ import ( "regexp" "strings" - "code.forgejo.org/forgejo/runner/act/common" - "code.forgejo.org/forgejo/runner/act/model" + "code.forgejo.org/forgejo/runner/v9/act/common" + "code.forgejo.org/forgejo/runner/v9/act/model" ) func evaluateCompositeInputAndEnv(ctx context.Context, parent *RunContext, step actionStep) map[string]string { diff --git a/act/runner/action_test.go b/act/runner/action_test.go index 68f38eee..a5d9e1d7 100644 --- a/act/runner/action_test.go +++ b/act/runner/action_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "code.forgejo.org/forgejo/runner/act/model" + "code.forgejo.org/forgejo/runner/v9/act/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/act/runner/command.go b/act/runner/command.go index d0b3754c..98942322 100644 --- a/act/runner/command.go +++ b/act/runner/command.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - "code.forgejo.org/forgejo/runner/act/common" + "code.forgejo.org/forgejo/runner/v9/act/common" ) var ( diff --git a/act/runner/command_test.go b/act/runner/command_test.go index 0edf9e4a..b2c3824a 100644 --- a/act/runner/command_test.go +++ b/act/runner/command_test.go @@ -10,8 +10,8 @@ import ( "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" - "code.forgejo.org/forgejo/runner/act/common" - "code.forgejo.org/forgejo/runner/act/model" + "code.forgejo.org/forgejo/runner/v9/act/common" + "code.forgejo.org/forgejo/runner/v9/act/model" ) func TestCommandSetEnv(t *testing.T) { diff --git a/act/runner/container_mock_test.go b/act/runner/container_mock_test.go index 5fc401f6..5d884a21 100644 --- a/act/runner/container_mock_test.go +++ b/act/runner/container_mock_test.go @@ -4,8 +4,8 @@ import ( "context" "io" - "code.forgejo.org/forgejo/runner/act/common" - "code.forgejo.org/forgejo/runner/act/container" + "code.forgejo.org/forgejo/runner/v9/act/common" + "code.forgejo.org/forgejo/runner/v9/act/container" "github.com/stretchr/testify/mock" ) diff --git a/act/runner/expression.go b/act/runner/expression.go index 34eadf17..a81c7d39 100644 --- a/act/runner/expression.go +++ b/act/runner/expression.go @@ -12,10 +12,10 @@ import ( _ "embed" - "code.forgejo.org/forgejo/runner/act/common" - "code.forgejo.org/forgejo/runner/act/container" - "code.forgejo.org/forgejo/runner/act/exprparser" - "code.forgejo.org/forgejo/runner/act/model" + "code.forgejo.org/forgejo/runner/v9/act/common" + "code.forgejo.org/forgejo/runner/v9/act/container" + "code.forgejo.org/forgejo/runner/v9/act/exprparser" + "code.forgejo.org/forgejo/runner/v9/act/model" "gopkg.in/yaml.v3" ) diff --git a/act/runner/expression_test.go b/act/runner/expression_test.go index 974d58ff..3bebc301 100644 --- a/act/runner/expression_test.go +++ b/act/runner/expression_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "code.forgejo.org/forgejo/runner/act/exprparser" - "code.forgejo.org/forgejo/runner/act/model" + "code.forgejo.org/forgejo/runner/v9/act/exprparser" + "code.forgejo.org/forgejo/runner/v9/act/model" assert "github.com/stretchr/testify/assert" yaml "gopkg.in/yaml.v3" ) diff --git a/act/runner/job_executor.go b/act/runner/job_executor.go index cda661e2..c3bcb4b8 100644 --- a/act/runner/job_executor.go +++ b/act/runner/job_executor.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - "code.forgejo.org/forgejo/runner/act/common" - "code.forgejo.org/forgejo/runner/act/container" - "code.forgejo.org/forgejo/runner/act/model" + "code.forgejo.org/forgejo/runner/v9/act/common" + "code.forgejo.org/forgejo/runner/v9/act/container" + "code.forgejo.org/forgejo/runner/v9/act/model" ) type jobInfo interface { diff --git a/act/runner/job_executor_test.go b/act/runner/job_executor_test.go index f0e5a23a..cd940f8d 100644 --- a/act/runner/job_executor_test.go +++ b/act/runner/job_executor_test.go @@ -6,9 +6,9 @@ import ( "io" "testing" - "code.forgejo.org/forgejo/runner/act/common" - "code.forgejo.org/forgejo/runner/act/container" - "code.forgejo.org/forgejo/runner/act/model" + "code.forgejo.org/forgejo/runner/v9/act/common" + "code.forgejo.org/forgejo/runner/v9/act/container" + "code.forgejo.org/forgejo/runner/v9/act/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/act/runner/local_repository_cache.go b/act/runner/local_repository_cache.go index e64a8965..984ee2cd 100644 --- a/act/runner/local_repository_cache.go +++ b/act/runner/local_repository_cache.go @@ -12,7 +12,7 @@ import ( "path/filepath" "strings" - "code.forgejo.org/forgejo/runner/act/filecollector" + "code.forgejo.org/forgejo/runner/v9/act/filecollector" ) type LocalRepositoryCache struct { diff --git a/act/runner/logger.go b/act/runner/logger.go index 395de0e1..f8d4f000 100644 --- a/act/runner/logger.go +++ b/act/runner/logger.go @@ -9,7 +9,7 @@ import ( "strings" "sync" - "code.forgejo.org/forgejo/runner/act/common" + "code.forgejo.org/forgejo/runner/v9/act/common" "github.com/sirupsen/logrus" "golang.org/x/term" diff --git a/act/runner/reusable_workflow.go b/act/runner/reusable_workflow.go index 835a111c..3a805b0a 100644 --- a/act/runner/reusable_workflow.go +++ b/act/runner/reusable_workflow.go @@ -12,9 +12,9 @@ import ( "strings" "sync" - "code.forgejo.org/forgejo/runner/act/common" - "code.forgejo.org/forgejo/runner/act/common/git" - "code.forgejo.org/forgejo/runner/act/model" + "code.forgejo.org/forgejo/runner/v9/act/common" + "code.forgejo.org/forgejo/runner/v9/act/common/git" + "code.forgejo.org/forgejo/runner/v9/act/model" ) func newLocalReusableWorkflowExecutor(rc *RunContext) common.Executor { diff --git a/act/runner/run_context.go b/act/runner/run_context.go index 67742aaa..52b742b0 100644 --- a/act/runner/run_context.go +++ b/act/runner/run_context.go @@ -20,10 +20,10 @@ import ( "text/template" "time" - "code.forgejo.org/forgejo/runner/act/common" - "code.forgejo.org/forgejo/runner/act/container" - "code.forgejo.org/forgejo/runner/act/exprparser" - "code.forgejo.org/forgejo/runner/act/model" + "code.forgejo.org/forgejo/runner/v9/act/common" + "code.forgejo.org/forgejo/runner/v9/act/container" + "code.forgejo.org/forgejo/runner/v9/act/exprparser" + "code.forgejo.org/forgejo/runner/v9/act/model" "github.com/docker/docker/api/types/network" "github.com/docker/go-connections/nat" "github.com/opencontainers/selinux/go-selinux" diff --git a/act/runner/run_context_test.go b/act/runner/run_context_test.go index df53f93a..24caa4ad 100644 --- a/act/runner/run_context_test.go +++ b/act/runner/run_context_test.go @@ -10,10 +10,10 @@ import ( "strings" "testing" - "code.forgejo.org/forgejo/runner/act/container" - "code.forgejo.org/forgejo/runner/act/exprparser" - "code.forgejo.org/forgejo/runner/act/model" - "code.forgejo.org/forgejo/runner/testutils" + "code.forgejo.org/forgejo/runner/v9/act/container" + "code.forgejo.org/forgejo/runner/v9/act/exprparser" + "code.forgejo.org/forgejo/runner/v9/act/model" + "code.forgejo.org/forgejo/runner/v9/testutils" "github.com/docker/go-connections/nat" log "github.com/sirupsen/logrus" diff --git a/act/runner/runner.go b/act/runner/runner.go index 516b06a3..19aea849 100644 --- a/act/runner/runner.go +++ b/act/runner/runner.go @@ -11,8 +11,8 @@ import ( docker_container "github.com/docker/docker/api/types/container" log "github.com/sirupsen/logrus" - "code.forgejo.org/forgejo/runner/act/common" - "code.forgejo.org/forgejo/runner/act/model" + "code.forgejo.org/forgejo/runner/v9/act/common" + "code.forgejo.org/forgejo/runner/v9/act/model" ) // Runner provides capabilities to run GitHub actions diff --git a/act/runner/runner_test.go b/act/runner/runner_test.go index 796038b8..2d3bed57 100644 --- a/act/runner/runner_test.go +++ b/act/runner/runner_test.go @@ -16,8 +16,8 @@ import ( assert "github.com/stretchr/testify/assert" "gopkg.in/yaml.v3" - "code.forgejo.org/forgejo/runner/act/common" - "code.forgejo.org/forgejo/runner/act/model" + "code.forgejo.org/forgejo/runner/v9/act/common" + "code.forgejo.org/forgejo/runner/v9/act/model" ) var ( diff --git a/act/runner/step.go b/act/runner/step.go index efe63d02..72102e8c 100644 --- a/act/runner/step.go +++ b/act/runner/step.go @@ -8,10 +8,10 @@ import ( "strings" "time" - "code.forgejo.org/forgejo/runner/act/common" - "code.forgejo.org/forgejo/runner/act/container" - "code.forgejo.org/forgejo/runner/act/exprparser" - "code.forgejo.org/forgejo/runner/act/model" + "code.forgejo.org/forgejo/runner/v9/act/common" + "code.forgejo.org/forgejo/runner/v9/act/container" + "code.forgejo.org/forgejo/runner/v9/act/exprparser" + "code.forgejo.org/forgejo/runner/v9/act/model" ) type step interface { diff --git a/act/runner/step_action_local.go b/act/runner/step_action_local.go index 3ef8d07f..79f1a542 100644 --- a/act/runner/step_action_local.go +++ b/act/runner/step_action_local.go @@ -11,8 +11,8 @@ import ( "path" "path/filepath" - "code.forgejo.org/forgejo/runner/act/common" - "code.forgejo.org/forgejo/runner/act/model" + "code.forgejo.org/forgejo/runner/v9/act/common" + "code.forgejo.org/forgejo/runner/v9/act/model" ) type stepActionLocal struct { diff --git a/act/runner/step_action_local_test.go b/act/runner/step_action_local_test.go index d62f118d..c988d3b1 100644 --- a/act/runner/step_action_local_test.go +++ b/act/runner/step_action_local_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "code.forgejo.org/forgejo/runner/act/common" - "code.forgejo.org/forgejo/runner/act/model" + "code.forgejo.org/forgejo/runner/v9/act/common" + "code.forgejo.org/forgejo/runner/v9/act/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "gopkg.in/yaml.v3" diff --git a/act/runner/step_action_remote.go b/act/runner/step_action_remote.go index 83260c02..920960c5 100644 --- a/act/runner/step_action_remote.go +++ b/act/runner/step_action_remote.go @@ -14,9 +14,9 @@ import ( gogit "github.com/go-git/go-git/v5" - "code.forgejo.org/forgejo/runner/act/common" - "code.forgejo.org/forgejo/runner/act/common/git" - "code.forgejo.org/forgejo/runner/act/model" + "code.forgejo.org/forgejo/runner/v9/act/common" + "code.forgejo.org/forgejo/runner/v9/act/common/git" + "code.forgejo.org/forgejo/runner/v9/act/model" ) type stepActionRemote struct { diff --git a/act/runner/step_action_remote_test.go b/act/runner/step_action_remote_test.go index 52cd88ee..864a580e 100644 --- a/act/runner/step_action_remote_test.go +++ b/act/runner/step_action_remote_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/mock" "gopkg.in/yaml.v3" - "code.forgejo.org/forgejo/runner/act/common" - "code.forgejo.org/forgejo/runner/act/common/git" - "code.forgejo.org/forgejo/runner/act/model" + "code.forgejo.org/forgejo/runner/v9/act/common" + "code.forgejo.org/forgejo/runner/v9/act/common/git" + "code.forgejo.org/forgejo/runner/v9/act/model" ) type stepActionRemoteMocks struct { diff --git a/act/runner/step_docker.go b/act/runner/step_docker.go index bc2d38ae..5ecddd21 100644 --- a/act/runner/step_docker.go +++ b/act/runner/step_docker.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" - "code.forgejo.org/forgejo/runner/act/common" - "code.forgejo.org/forgejo/runner/act/container" - "code.forgejo.org/forgejo/runner/act/model" + "code.forgejo.org/forgejo/runner/v9/act/common" + "code.forgejo.org/forgejo/runner/v9/act/container" + "code.forgejo.org/forgejo/runner/v9/act/model" "github.com/kballard/go-shellquote" ) diff --git a/act/runner/step_docker_test.go b/act/runner/step_docker_test.go index 9a2a259f..9608978e 100644 --- a/act/runner/step_docker_test.go +++ b/act/runner/step_docker_test.go @@ -6,8 +6,8 @@ import ( "io" "testing" - "code.forgejo.org/forgejo/runner/act/container" - "code.forgejo.org/forgejo/runner/act/model" + "code.forgejo.org/forgejo/runner/v9/act/container" + "code.forgejo.org/forgejo/runner/v9/act/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/act/runner/step_factory.go b/act/runner/step_factory.go index 1da9ed28..6435d37e 100644 --- a/act/runner/step_factory.go +++ b/act/runner/step_factory.go @@ -3,7 +3,7 @@ package runner import ( "fmt" - "code.forgejo.org/forgejo/runner/act/model" + "code.forgejo.org/forgejo/runner/v9/act/model" ) type stepFactory interface { diff --git a/act/runner/step_factory_test.go b/act/runner/step_factory_test.go index 2e63f499..af8cf968 100644 --- a/act/runner/step_factory_test.go +++ b/act/runner/step_factory_test.go @@ -3,7 +3,7 @@ package runner import ( "testing" - "code.forgejo.org/forgejo/runner/act/model" + "code.forgejo.org/forgejo/runner/v9/act/model" "github.com/stretchr/testify/assert" ) diff --git a/act/runner/step_run.go b/act/runner/step_run.go index 7cb30a3a..3c84b554 100644 --- a/act/runner/step_run.go +++ b/act/runner/step_run.go @@ -8,10 +8,10 @@ import ( "github.com/kballard/go-shellquote" - "code.forgejo.org/forgejo/runner/act/common" - "code.forgejo.org/forgejo/runner/act/container" - "code.forgejo.org/forgejo/runner/act/lookpath" - "code.forgejo.org/forgejo/runner/act/model" + "code.forgejo.org/forgejo/runner/v9/act/common" + "code.forgejo.org/forgejo/runner/v9/act/container" + "code.forgejo.org/forgejo/runner/v9/act/lookpath" + "code.forgejo.org/forgejo/runner/v9/act/model" ) type stepRun struct { diff --git a/act/runner/step_run_test.go b/act/runner/step_run_test.go index d35704e1..611b1274 100644 --- a/act/runner/step_run_test.go +++ b/act/runner/step_run_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "code.forgejo.org/forgejo/runner/act/container" - "code.forgejo.org/forgejo/runner/act/model" + "code.forgejo.org/forgejo/runner/v9/act/container" + "code.forgejo.org/forgejo/runner/v9/act/model" ) func TestStepRun(t *testing.T) { diff --git a/act/runner/step_test.go b/act/runner/step_test.go index d973dce0..b7bb31dd 100644 --- a/act/runner/step_test.go +++ b/act/runner/step_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "code.forgejo.org/forgejo/runner/act/common" - "code.forgejo.org/forgejo/runner/act/model" + "code.forgejo.org/forgejo/runner/v9/act/common" + "code.forgejo.org/forgejo/runner/v9/act/model" log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/go.mod b/go.mod index 6fabbf3d..a6ce2c21 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module code.forgejo.org/forgejo/runner +module code.forgejo.org/forgejo/runner/v9 go 1.23.0 diff --git a/internal/app/cmd/cache-server.go b/internal/app/cmd/cache-server.go index bb4d774c..ff233f19 100644 --- a/internal/app/cmd/cache-server.go +++ b/internal/app/cmd/cache-server.go @@ -9,9 +9,9 @@ import ( "os" "os/signal" - "code.forgejo.org/forgejo/runner/internal/pkg/config" + "code.forgejo.org/forgejo/runner/v9/internal/pkg/config" - "code.forgejo.org/forgejo/runner/act/artifactcache" + "code.forgejo.org/forgejo/runner/v9/act/artifactcache" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/internal/app/cmd/cmd.go b/internal/app/cmd/cmd.go index 00b84301..c3a98a88 100644 --- a/internal/app/cmd/cmd.go +++ b/internal/app/cmd/cmd.go @@ -10,8 +10,8 @@ import ( "github.com/spf13/cobra" - "code.forgejo.org/forgejo/runner/internal/pkg/config" - "code.forgejo.org/forgejo/runner/internal/pkg/ver" + "code.forgejo.org/forgejo/runner/v9/internal/pkg/config" + "code.forgejo.org/forgejo/runner/v9/internal/pkg/ver" ) func Execute(ctx context.Context) { diff --git a/internal/app/cmd/create-runner-file.go b/internal/app/cmd/create-runner-file.go index fdfc65e9..0eeb713b 100644 --- a/internal/app/cmd/create-runner-file.go +++ b/internal/app/cmd/create-runner-file.go @@ -14,10 +14,10 @@ import ( log "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "code.forgejo.org/forgejo/runner/internal/app/run" - "code.forgejo.org/forgejo/runner/internal/pkg/client" - "code.forgejo.org/forgejo/runner/internal/pkg/config" - "code.forgejo.org/forgejo/runner/internal/pkg/ver" + "code.forgejo.org/forgejo/runner/v9/internal/app/run" + "code.forgejo.org/forgejo/runner/v9/internal/pkg/client" + "code.forgejo.org/forgejo/runner/v9/internal/pkg/config" + "code.forgejo.org/forgejo/runner/v9/internal/pkg/ver" ) type createRunnerFileArgs struct { diff --git a/internal/app/cmd/create-runner-file_test.go b/internal/app/cmd/create-runner-file_test.go index 4d786076..d12cc325 100644 --- a/internal/app/cmd/create-runner-file_test.go +++ b/internal/app/cmd/create-runner-file_test.go @@ -8,9 +8,9 @@ import ( "testing" runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1" - "code.forgejo.org/forgejo/runner/internal/pkg/client" - "code.forgejo.org/forgejo/runner/internal/pkg/config" - "code.forgejo.org/forgejo/runner/internal/pkg/ver" + "code.forgejo.org/forgejo/runner/v9/internal/pkg/client" + "code.forgejo.org/forgejo/runner/v9/internal/pkg/config" + "code.forgejo.org/forgejo/runner/v9/internal/pkg/ver" "connectrpc.com/connect" "github.com/stretchr/testify/assert" diff --git a/internal/app/cmd/daemon.go b/internal/app/cmd/daemon.go index 592372dc..0a9815ed 100644 --- a/internal/app/cmd/daemon.go +++ b/internal/app/cmd/daemon.go @@ -18,13 +18,13 @@ import ( log "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "code.forgejo.org/forgejo/runner/internal/app/poll" - "code.forgejo.org/forgejo/runner/internal/app/run" - "code.forgejo.org/forgejo/runner/internal/pkg/client" - "code.forgejo.org/forgejo/runner/internal/pkg/config" - "code.forgejo.org/forgejo/runner/internal/pkg/envcheck" - "code.forgejo.org/forgejo/runner/internal/pkg/labels" - "code.forgejo.org/forgejo/runner/internal/pkg/ver" + "code.forgejo.org/forgejo/runner/v9/internal/app/poll" + "code.forgejo.org/forgejo/runner/v9/internal/app/run" + "code.forgejo.org/forgejo/runner/v9/internal/pkg/client" + "code.forgejo.org/forgejo/runner/v9/internal/pkg/config" + "code.forgejo.org/forgejo/runner/v9/internal/pkg/envcheck" + "code.forgejo.org/forgejo/runner/v9/internal/pkg/labels" + "code.forgejo.org/forgejo/runner/v9/internal/pkg/ver" ) func runDaemon(ctx context.Context, configFile *string) func(cmd *cobra.Command, args []string) error { diff --git a/internal/app/cmd/exec.go b/internal/app/cmd/exec.go index d04c2f5d..8c197711 100644 --- a/internal/app/cmd/exec.go +++ b/internal/app/cmd/exec.go @@ -13,10 +13,10 @@ import ( "strings" "time" - "code.forgejo.org/forgejo/runner/act/artifactcache" - "code.forgejo.org/forgejo/runner/act/common" - "code.forgejo.org/forgejo/runner/act/model" - "code.forgejo.org/forgejo/runner/act/runner" + "code.forgejo.org/forgejo/runner/v9/act/artifactcache" + "code.forgejo.org/forgejo/runner/v9/act/common" + "code.forgejo.org/forgejo/runner/v9/act/model" + "code.forgejo.org/forgejo/runner/v9/act/runner" "github.com/docker/docker/api/types/container" "github.com/joho/godotenv" log "github.com/sirupsen/logrus" diff --git a/internal/app/cmd/job.go b/internal/app/cmd/job.go index b195a86a..3be1f635 100644 --- a/internal/app/cmd/job.go +++ b/internal/app/cmd/job.go @@ -13,13 +13,13 @@ import ( log "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "code.forgejo.org/forgejo/runner/internal/app/job" - "code.forgejo.org/forgejo/runner/internal/app/run" - "code.forgejo.org/forgejo/runner/internal/pkg/client" - "code.forgejo.org/forgejo/runner/internal/pkg/config" - "code.forgejo.org/forgejo/runner/internal/pkg/envcheck" - "code.forgejo.org/forgejo/runner/internal/pkg/labels" - "code.forgejo.org/forgejo/runner/internal/pkg/ver" + "code.forgejo.org/forgejo/runner/v9/internal/app/job" + "code.forgejo.org/forgejo/runner/v9/internal/app/run" + "code.forgejo.org/forgejo/runner/v9/internal/pkg/client" + "code.forgejo.org/forgejo/runner/v9/internal/pkg/config" + "code.forgejo.org/forgejo/runner/v9/internal/pkg/envcheck" + "code.forgejo.org/forgejo/runner/v9/internal/pkg/labels" + "code.forgejo.org/forgejo/runner/v9/internal/pkg/ver" ) func runJob(ctx context.Context, configFile *string) func(cmd *cobra.Command, args []string) error { diff --git a/internal/app/cmd/main_test.go b/internal/app/cmd/main_test.go index 6283b8a4..588490e8 100644 --- a/internal/app/cmd/main_test.go +++ b/internal/app/cmd/main_test.go @@ -10,7 +10,7 @@ import ( "os" "testing" - "code.forgejo.org/forgejo/runner/testutils" + "code.forgejo.org/forgejo/runner/v9/testutils" "github.com/spf13/cobra" "github.com/stretchr/testify/require" diff --git a/internal/app/cmd/register.go b/internal/app/cmd/register.go index 8e66cb89..dd369381 100644 --- a/internal/app/cmd/register.go +++ b/internal/app/cmd/register.go @@ -20,10 +20,10 @@ import ( log "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "code.forgejo.org/forgejo/runner/internal/pkg/client" - "code.forgejo.org/forgejo/runner/internal/pkg/config" - "code.forgejo.org/forgejo/runner/internal/pkg/labels" - "code.forgejo.org/forgejo/runner/internal/pkg/ver" + "code.forgejo.org/forgejo/runner/v9/internal/pkg/client" + "code.forgejo.org/forgejo/runner/v9/internal/pkg/config" + "code.forgejo.org/forgejo/runner/v9/internal/pkg/labels" + "code.forgejo.org/forgejo/runner/v9/internal/pkg/ver" ) // runRegister registers a runner to the server diff --git a/internal/app/cmd/validate.go b/internal/app/cmd/validate.go index b2a73ebf..3285ff6f 100644 --- a/internal/app/cmd/validate.go +++ b/internal/app/cmd/validate.go @@ -13,8 +13,8 @@ import ( "path/filepath" "strings" - "code.forgejo.org/forgejo/runner/act/model" - "code.forgejo.org/forgejo/runner/testutils" + "code.forgejo.org/forgejo/runner/v9/act/model" + "code.forgejo.org/forgejo/runner/v9/testutils" "github.com/spf13/cobra" ) diff --git a/internal/app/job/job.go b/internal/app/job/job.go index 9a7638a1..2dd06852 100644 --- a/internal/app/job/job.go +++ b/internal/app/job/job.go @@ -13,9 +13,9 @@ import ( log "github.com/sirupsen/logrus" runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1" - "code.forgejo.org/forgejo/runner/internal/app/run" - "code.forgejo.org/forgejo/runner/internal/pkg/client" - "code.forgejo.org/forgejo/runner/internal/pkg/config" + "code.forgejo.org/forgejo/runner/v9/internal/app/run" + "code.forgejo.org/forgejo/runner/v9/internal/pkg/client" + "code.forgejo.org/forgejo/runner/v9/internal/pkg/config" ) type Job struct { diff --git a/internal/app/job/job_test.go b/internal/app/job/job_test.go index 8d4376b0..9799425b 100644 --- a/internal/app/job/job_test.go +++ b/internal/app/job/job_test.go @@ -11,7 +11,7 @@ import ( "code.forgejo.org/forgejo/actions-proto/ping/v1/pingv1connect" runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1" "code.forgejo.org/forgejo/actions-proto/runner/v1/runnerv1connect" - "code.forgejo.org/forgejo/runner/internal/pkg/config" + "code.forgejo.org/forgejo/runner/v9/internal/pkg/config" log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" diff --git a/internal/app/poll/poller.go b/internal/app/poll/poller.go index 61b1c2ff..4ebe4405 100644 --- a/internal/app/poll/poller.go +++ b/internal/app/poll/poller.go @@ -15,9 +15,9 @@ import ( log "github.com/sirupsen/logrus" "golang.org/x/time/rate" - "code.forgejo.org/forgejo/runner/internal/app/run" - "code.forgejo.org/forgejo/runner/internal/pkg/client" - "code.forgejo.org/forgejo/runner/internal/pkg/config" + "code.forgejo.org/forgejo/runner/v9/internal/app/run" + "code.forgejo.org/forgejo/runner/v9/internal/pkg/client" + "code.forgejo.org/forgejo/runner/v9/internal/pkg/config" ) const PollerID = "PollerID" diff --git a/internal/app/poll/poller_test.go b/internal/app/poll/poller_test.go index eedc0fee..0c5febfe 100644 --- a/internal/app/poll/poller_test.go +++ b/internal/app/poll/poller_test.go @@ -14,7 +14,7 @@ import ( "code.forgejo.org/forgejo/actions-proto/ping/v1/pingv1connect" runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1" "code.forgejo.org/forgejo/actions-proto/runner/v1/runnerv1connect" - "code.forgejo.org/forgejo/runner/internal/pkg/config" + "code.forgejo.org/forgejo/runner/v9/internal/pkg/config" log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" diff --git a/internal/app/run/runner.go b/internal/app/run/runner.go index ce3587a8..e8d91822 100644 --- a/internal/app/run/runner.go +++ b/internal/app/run/runner.go @@ -16,20 +16,20 @@ import ( "time" runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1" - "code.forgejo.org/forgejo/runner/act/artifactcache" - "code.forgejo.org/forgejo/runner/act/cacheproxy" - "code.forgejo.org/forgejo/runner/act/common" - "code.forgejo.org/forgejo/runner/act/model" - "code.forgejo.org/forgejo/runner/act/runner" + "code.forgejo.org/forgejo/runner/v9/act/artifactcache" + "code.forgejo.org/forgejo/runner/v9/act/cacheproxy" + "code.forgejo.org/forgejo/runner/v9/act/common" + "code.forgejo.org/forgejo/runner/v9/act/model" + "code.forgejo.org/forgejo/runner/v9/act/runner" "connectrpc.com/connect" "github.com/docker/docker/api/types/container" log "github.com/sirupsen/logrus" - "code.forgejo.org/forgejo/runner/internal/pkg/client" - "code.forgejo.org/forgejo/runner/internal/pkg/config" - "code.forgejo.org/forgejo/runner/internal/pkg/labels" - "code.forgejo.org/forgejo/runner/internal/pkg/report" - "code.forgejo.org/forgejo/runner/internal/pkg/ver" + "code.forgejo.org/forgejo/runner/v9/internal/pkg/client" + "code.forgejo.org/forgejo/runner/v9/internal/pkg/config" + "code.forgejo.org/forgejo/runner/v9/internal/pkg/labels" + "code.forgejo.org/forgejo/runner/v9/internal/pkg/report" + "code.forgejo.org/forgejo/runner/v9/internal/pkg/ver" ) // Runner runs the pipeline. diff --git a/internal/app/run/runner_test.go b/internal/app/run/runner_test.go index 849b95a4..a9a8445d 100644 --- a/internal/app/run/runner_test.go +++ b/internal/app/run/runner_test.go @@ -7,7 +7,7 @@ import ( "testing" runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1" - "code.forgejo.org/forgejo/runner/internal/pkg/labels" + "code.forgejo.org/forgejo/runner/v9/internal/pkg/labels" "github.com/stretchr/testify/assert" ) diff --git a/internal/app/run/workflow.go b/internal/app/run/workflow.go index 4b4007f0..601f36d1 100644 --- a/internal/app/run/workflow.go +++ b/internal/app/run/workflow.go @@ -10,7 +10,7 @@ import ( "strings" runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1" - "code.forgejo.org/forgejo/runner/act/model" + "code.forgejo.org/forgejo/runner/v9/act/model" "gopkg.in/yaml.v3" ) diff --git a/internal/app/run/workflow_test.go b/internal/app/run/workflow_test.go index 049edb79..f0ac579c 100644 --- a/internal/app/run/workflow_test.go +++ b/internal/app/run/workflow_test.go @@ -7,7 +7,7 @@ import ( "testing" runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1" - "code.forgejo.org/forgejo/runner/act/model" + "code.forgejo.org/forgejo/runner/v9/act/model" "github.com/stretchr/testify/require" "gotest.tools/v3/assert" ) diff --git a/internal/pkg/report/reporter.go b/internal/pkg/report/reporter.go index 518fa6ac..6d08269c 100644 --- a/internal/pkg/report/reporter.go +++ b/internal/pkg/report/reporter.go @@ -19,7 +19,7 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/timestamppb" - "code.forgejo.org/forgejo/runner/internal/pkg/client" + "code.forgejo.org/forgejo/runner/v9/internal/pkg/client" ) var ( diff --git a/internal/pkg/report/reporter_test.go b/internal/pkg/report/reporter_test.go index 5a7563c8..2839c847 100644 --- a/internal/pkg/report/reporter_test.go +++ b/internal/pkg/report/reporter_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/types/known/structpb" - "code.forgejo.org/forgejo/runner/internal/pkg/client/mocks" - "code.forgejo.org/forgejo/runner/testutils" + "code.forgejo.org/forgejo/runner/v9/internal/pkg/client/mocks" + "code.forgejo.org/forgejo/runner/v9/testutils" ) func rowsToString(rows []*runnerv1.LogRow) string { diff --git a/internal/pkg/ver/version.go b/internal/pkg/ver/version.go index e843ec21..9efc8739 100644 --- a/internal/pkg/ver/version.go +++ b/internal/pkg/ver/version.go @@ -3,7 +3,7 @@ package ver -// go build -ldflags "-X code.forgejo.org/forgejo/runner/internal/pkg/ver.version=1.2.3" +// go build -ldflags "-X code.forgejo.org/forgejo/runner/v9/internal/pkg/ver.version=1.2.3" var version = "dev" func Version() string { diff --git a/main.go b/main.go index 18eeee6e..498bd129 100644 --- a/main.go +++ b/main.go @@ -8,7 +8,7 @@ import ( "os/signal" "syscall" - "code.forgejo.org/forgejo/runner/internal/app/cmd" + "code.forgejo.org/forgejo/runner/v9/internal/app/cmd" ) func main() {