From 8a7f760d3c62102852e852fca8b1c1e99c59e53f Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Fri, 5 Sep 2025 07:29:38 +0000 Subject: [PATCH] chore: bump version to v11 (#940) the license change from MIT to GPLv3+ is a breaking change Refs forgejo/runner#773 - other - [PR](https://code.forgejo.org/forgejo/runner/pulls/940): chore: bump version to v11 Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/940 Reviewed-by: Michael Kriese Co-authored-by: Earl Warren Co-committed-by: Earl Warren --- Makefile | 4 ++-- act/artifactcache/handler.go | 2 +- act/cacheproxy/handler.go | 4 ++-- 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_images.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 | 6 +++--- 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 | 6 +++--- internal/app/run/workflow.go | 2 +- internal/app/run/workflow_test.go | 2 +- internal/pkg/report/reporter.go | 4 ++-- internal/pkg/report/reporter_test.go | 6 +++--- internal/pkg/ver/version.go | 2 +- main.go | 2 +- 83 files changed, 176 insertions(+), 176 deletions(-) diff --git a/Makefile b/Makefile index 13e4f774..1b4890ec 100644 --- a/Makefile +++ b/Makefile @@ -62,10 +62,10 @@ else endif endif -GO_PACKAGES_TO_VET ?= $(filter-out code.forgejo.org/forgejo/runner/v9/internal/pkg/client/mocks,$(shell $(GO) list ./...)) +GO_PACKAGES_TO_VET ?= $(filter-out code.forgejo.org/forgejo/runner/v11/internal/pkg/client/mocks,$(shell $(GO) list ./...)) TAGS ?= -LDFLAGS ?= -X "code.forgejo.org/forgejo/runner/v9/internal/pkg/ver.version=v$(RELEASE_VERSION)" +LDFLAGS ?= -X "code.forgejo.org/forgejo/runner/v11/internal/pkg/ver.version=v$(RELEASE_VERSION)" all: build diff --git a/act/artifactcache/handler.go b/act/artifactcache/handler.go index 54087746..ac7355d0 100644 --- a/act/artifactcache/handler.go +++ b/act/artifactcache/handler.go @@ -20,7 +20,7 @@ import ( "github.com/timshannon/bolthold" "go.etcd.io/bbolt" - "code.forgejo.org/forgejo/runner/v9/act/common" + "code.forgejo.org/forgejo/runner/v11/act/common" ) const ( diff --git a/act/cacheproxy/handler.go b/act/cacheproxy/handler.go index a9610a02..17adf3b5 100644 --- a/act/cacheproxy/handler.go +++ b/act/cacheproxy/handler.go @@ -19,8 +19,8 @@ import ( "github.com/julienschmidt/httprouter" "github.com/sirupsen/logrus" - "code.forgejo.org/forgejo/runner/v9/act/artifactcache" - "code.forgejo.org/forgejo/runner/v9/act/common" + "code.forgejo.org/forgejo/runner/v11/act/artifactcache" + "code.forgejo.org/forgejo/runner/v11/act/common" ) const ( diff --git a/act/common/git/git.go b/act/common/git/git.go index bffe4feb..2d3f1249 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/v9/act/common" + "code.forgejo.org/forgejo/runner/v11/act/common" ) var ( diff --git a/act/common/git/git_test.go b/act/common/git/git_test.go index 738c6afb..8bb5ec64 100644 --- a/act/common/git/git_test.go +++ b/act/common/git/git_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "code.forgejo.org/forgejo/runner/v9/act/common" + "code.forgejo.org/forgejo/runner/v11/act/common" ) func TestFindGitSlug(t *testing.T) { diff --git a/act/container/container_types.go b/act/container/container_types.go index eb524cef..aade7799 100644 --- a/act/container/container_types.go +++ b/act/container/container_types.go @@ -5,7 +5,7 @@ import ( "io" "time" - "code.forgejo.org/forgejo/runner/v9/act/common" + "code.forgejo.org/forgejo/runner/v11/act/common" "github.com/docker/go-connections/nat" ) diff --git a/act/container/docker_auth.go b/act/container/docker_auth.go index 555832cb..003a0f14 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/v9/act/common" + "code.forgejo.org/forgejo/runner/v11/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 0400ac63..258a9363 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/v9/act/common" + "code.forgejo.org/forgejo/runner/v11/act/common" ) // NewDockerBuildExecutor function to create a run executor for the container diff --git a/act/container/docker_images.go b/act/container/docker_images.go index 59fad154..70b99b51 100644 --- a/act/container/docker_images.go +++ b/act/container/docker_images.go @@ -6,7 +6,7 @@ import ( "context" "fmt" - "code.forgejo.org/forgejo/runner/v9/act/common" + "code.forgejo.org/forgejo/runner/v11/act/common" cerrdefs "github.com/containerd/errdefs" "github.com/docker/docker/api/types/image" ) diff --git a/act/container/docker_network.go b/act/container/docker_network.go index d58cf1a7..100d1b0f 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/v9/act/common" + "code.forgejo.org/forgejo/runner/v11/act/common" "github.com/docker/docker/api/types/network" ) diff --git a/act/container/docker_pull.go b/act/container/docker_pull.go index 94cef06b..f0fb1485 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/v9/act/common" + "code.forgejo.org/forgejo/runner/v11/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 7a17d74d..b1247528 100644 --- a/act/container/docker_run.go +++ b/act/container/docker_run.go @@ -38,8 +38,8 @@ import ( "github.com/spf13/pflag" "golang.org/x/term" - "code.forgejo.org/forgejo/runner/v9/act/common" - "code.forgejo.org/forgejo/runner/v9/act/filecollector" + "code.forgejo.org/forgejo/runner/v11/act/common" + "code.forgejo.org/forgejo/runner/v11/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 1e93a9f2..b70350b4 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/v9/act/common" + "code.forgejo.org/forgejo/runner/v11/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 1ed58c19..34cc094b 100644 --- a/act/container/docker_stub.go +++ b/act/container/docker_stub.go @@ -7,7 +7,7 @@ import ( "errors" "runtime" - "code.forgejo.org/forgejo/runner/v9/act/common" + "code.forgejo.org/forgejo/runner/v11/act/common" "github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/system" ) diff --git a/act/container/docker_volume.go b/act/container/docker_volume.go index 207f10da..e15262c4 100644 --- a/act/container/docker_volume.go +++ b/act/container/docker_volume.go @@ -6,7 +6,7 @@ import ( "context" "slices" - "code.forgejo.org/forgejo/runner/v9/act/common" + "code.forgejo.org/forgejo/runner/v11/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 8a60970b..0e12fa3a 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/v9/act/common" - "code.forgejo.org/forgejo/runner/v9/act/filecollector" - "code.forgejo.org/forgejo/runner/v9/act/lookpath" + "code.forgejo.org/forgejo/runner/v11/act/common" + "code.forgejo.org/forgejo/runner/v11/act/filecollector" + "code.forgejo.org/forgejo/runner/v11/act/lookpath" ) type HostEnvironment struct { diff --git a/act/container/parse_env_file.go b/act/container/parse_env_file.go index 227facb4..e65ae54a 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/v9/act/common" + "code.forgejo.org/forgejo/runner/v11/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 b0d383e5..03bde85e 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/v9/act/model" + "code.forgejo.org/forgejo/runner/v11/act/model" "github.com/rhysd/actionlint" ) diff --git a/act/exprparser/functions_test.go b/act/exprparser/functions_test.go index 827eca61..6073ac3b 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/v9/act/model" + "code.forgejo.org/forgejo/runner/v11/act/model" "github.com/stretchr/testify/assert" ) diff --git a/act/exprparser/interpreter.go b/act/exprparser/interpreter.go index 155296da..8ec3f7b4 100644 --- a/act/exprparser/interpreter.go +++ b/act/exprparser/interpreter.go @@ -7,7 +7,7 @@ import ( "reflect" "strings" - "code.forgejo.org/forgejo/runner/v9/act/model" + "code.forgejo.org/forgejo/runner/v11/act/model" "github.com/rhysd/actionlint" ) diff --git a/act/exprparser/interpreter_test.go b/act/exprparser/interpreter_test.go index 248a007c..883ef84a 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/v9/act/model" + "code.forgejo.org/forgejo/runner/v11/act/model" "github.com/stretchr/testify/assert" ) diff --git a/act/jobparser/evaluator.go b/act/jobparser/evaluator.go index a452dd2a..99230256 100644 --- a/act/jobparser/evaluator.go +++ b/act/jobparser/evaluator.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - "code.forgejo.org/forgejo/runner/v9/act/exprparser" + "code.forgejo.org/forgejo/runner/v11/act/exprparser" "go.yaml.in/yaml/v3" ) diff --git a/act/jobparser/interpeter.go b/act/jobparser/interpeter.go index 4de4cd64..e82444e4 100644 --- a/act/jobparser/interpeter.go +++ b/act/jobparser/interpeter.go @@ -1,8 +1,8 @@ package jobparser import ( - "code.forgejo.org/forgejo/runner/v9/act/exprparser" - "code.forgejo.org/forgejo/runner/v9/act/model" + "code.forgejo.org/forgejo/runner/v11/act/exprparser" + "code.forgejo.org/forgejo/runner/v11/act/model" "go.yaml.in/yaml/v3" ) diff --git a/act/jobparser/jobparser.go b/act/jobparser/jobparser.go index 1329a818..3542236f 100644 --- a/act/jobparser/jobparser.go +++ b/act/jobparser/jobparser.go @@ -8,7 +8,7 @@ import ( "go.yaml.in/yaml/v3" - "code.forgejo.org/forgejo/runner/v9/act/model" + "code.forgejo.org/forgejo/runner/v11/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 4d3f8d42..ed6e5ece 100644 --- a/act/jobparser/model.go +++ b/act/jobparser/model.go @@ -4,7 +4,7 @@ import ( "bytes" "fmt" - "code.forgejo.org/forgejo/runner/v9/act/model" + "code.forgejo.org/forgejo/runner/v11/act/model" "go.yaml.in/yaml/v3" ) diff --git a/act/jobparser/model_test.go b/act/jobparser/model_test.go index 1edaf4a5..fd62ef65 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/v9/act/model" + "code.forgejo.org/forgejo/runner/v11/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 dfbf2f76..a918f353 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/v9/act/model" + "code.forgejo.org/forgejo/runner/v11/act/model" "github.com/stretchr/testify/require" ) diff --git a/act/model/action.go b/act/model/action.go index 6f2354f6..72b986f0 100644 --- a/act/model/action.go +++ b/act/model/action.go @@ -5,7 +5,7 @@ import ( "io" "strings" - "code.forgejo.org/forgejo/runner/v9/act/schema" + "code.forgejo.org/forgejo/runner/v11/act/schema" "go.yaml.in/yaml/v3" ) diff --git a/act/model/github_context.go b/act/model/github_context.go index d23a6dd8..4a3d0bd9 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/v9/act/common" - "code.forgejo.org/forgejo/runner/v9/act/common/git" + "code.forgejo.org/forgejo/runner/v11/act/common" + "code.forgejo.org/forgejo/runner/v11/act/common/git" ) type GithubContext struct { diff --git a/act/model/workflow.go b/act/model/workflow.go index 12bba60b..c1bc4097 100644 --- a/act/model/workflow.go +++ b/act/model/workflow.go @@ -13,8 +13,8 @@ import ( "strings" "sync" - "code.forgejo.org/forgejo/runner/v9/act/common" - "code.forgejo.org/forgejo/runner/v9/act/schema" + "code.forgejo.org/forgejo/runner/v11/act/common" + "code.forgejo.org/forgejo/runner/v11/act/schema" log "github.com/sirupsen/logrus" "go.yaml.in/yaml/v3" ) diff --git a/act/runner/action.go b/act/runner/action.go index d27f0a84..1ecd51c1 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/v9/act/common" - "code.forgejo.org/forgejo/runner/v9/act/container" - "code.forgejo.org/forgejo/runner/v9/act/model" + "code.forgejo.org/forgejo/runner/v11/act/common" + "code.forgejo.org/forgejo/runner/v11/act/container" + "code.forgejo.org/forgejo/runner/v11/act/model" ) type actionStep interface { diff --git a/act/runner/action_cache.go b/act/runner/action_cache.go index c884eb4f..2650c700 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/v9/act/common" + "code.forgejo.org/forgejo/runner/v11/act/common" ) type ActionCache interface { diff --git a/act/runner/action_composite.go b/act/runner/action_composite.go index 45481cd4..8992f5bc 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/v9/act/common" - "code.forgejo.org/forgejo/runner/v9/act/model" + "code.forgejo.org/forgejo/runner/v11/act/common" + "code.forgejo.org/forgejo/runner/v11/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 3e1bc27f..f549f7e9 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/v9/act/model" + "code.forgejo.org/forgejo/runner/v11/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 f936ce15..3250a3f2 100644 --- a/act/runner/command.go +++ b/act/runner/command.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - "code.forgejo.org/forgejo/runner/v9/act/common" + "code.forgejo.org/forgejo/runner/v11/act/common" "github.com/sirupsen/logrus" ) diff --git a/act/runner/command_test.go b/act/runner/command_test.go index 51f4198a..4db11089 100644 --- a/act/runner/command_test.go +++ b/act/runner/command_test.go @@ -9,8 +9,8 @@ import ( "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" - "code.forgejo.org/forgejo/runner/v9/act/common" - "code.forgejo.org/forgejo/runner/v9/act/model" + "code.forgejo.org/forgejo/runner/v11/act/common" + "code.forgejo.org/forgejo/runner/v11/act/model" ) func TestCommandSetEnv(t *testing.T) { diff --git a/act/runner/container_mock_test.go b/act/runner/container_mock_test.go index 5d884a21..ce5603f7 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/v9/act/common" - "code.forgejo.org/forgejo/runner/v9/act/container" + "code.forgejo.org/forgejo/runner/v11/act/common" + "code.forgejo.org/forgejo/runner/v11/act/container" "github.com/stretchr/testify/mock" ) diff --git a/act/runner/expression.go b/act/runner/expression.go index 11791ef4..e17af233 100644 --- a/act/runner/expression.go +++ b/act/runner/expression.go @@ -13,10 +13,10 @@ import ( _ "embed" - "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" + "code.forgejo.org/forgejo/runner/v11/act/common" + "code.forgejo.org/forgejo/runner/v11/act/container" + "code.forgejo.org/forgejo/runner/v11/act/exprparser" + "code.forgejo.org/forgejo/runner/v11/act/model" "go.yaml.in/yaml/v3" ) diff --git a/act/runner/expression_test.go b/act/runner/expression_test.go index 00cbc603..12eecd9f 100644 --- a/act/runner/expression_test.go +++ b/act/runner/expression_test.go @@ -3,8 +3,8 @@ package runner import ( "testing" - "code.forgejo.org/forgejo/runner/v9/act/exprparser" - "code.forgejo.org/forgejo/runner/v9/act/model" + "code.forgejo.org/forgejo/runner/v11/act/exprparser" + "code.forgejo.org/forgejo/runner/v11/act/model" assert "github.com/stretchr/testify/assert" yaml "go.yaml.in/yaml/v3" ) diff --git a/act/runner/job_executor.go b/act/runner/job_executor.go index ebecf31c..cb50c84c 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/v9/act/common" - "code.forgejo.org/forgejo/runner/v9/act/container" - "code.forgejo.org/forgejo/runner/v9/act/model" + "code.forgejo.org/forgejo/runner/v11/act/common" + "code.forgejo.org/forgejo/runner/v11/act/container" + "code.forgejo.org/forgejo/runner/v11/act/model" ) type jobInfo interface { diff --git a/act/runner/job_executor_test.go b/act/runner/job_executor_test.go index efe35e65..e42bf610 100644 --- a/act/runner/job_executor_test.go +++ b/act/runner/job_executor_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "code.forgejo.org/forgejo/runner/v9/act/common" - "code.forgejo.org/forgejo/runner/v9/act/container" - "code.forgejo.org/forgejo/runner/v9/act/model" + "code.forgejo.org/forgejo/runner/v11/act/common" + "code.forgejo.org/forgejo/runner/v11/act/container" + "code.forgejo.org/forgejo/runner/v11/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 984ee2cd..17b60c92 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/v9/act/filecollector" + "code.forgejo.org/forgejo/runner/v11/act/filecollector" ) type LocalRepositoryCache struct { diff --git a/act/runner/logger.go b/act/runner/logger.go index 07261f27..f97292bf 100644 --- a/act/runner/logger.go +++ b/act/runner/logger.go @@ -10,7 +10,7 @@ import ( "strings" "sync" - "code.forgejo.org/forgejo/runner/v9/act/common" + "code.forgejo.org/forgejo/runner/v11/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 acb4bf4d..5e92ee88 100644 --- a/act/runner/reusable_workflow.go +++ b/act/runner/reusable_workflow.go @@ -13,9 +13,9 @@ import ( "strings" "sync" - "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" + "code.forgejo.org/forgejo/runner/v11/act/common" + "code.forgejo.org/forgejo/runner/v11/act/common/git" + "code.forgejo.org/forgejo/runner/v11/act/model" ) func newLocalReusableWorkflowExecutor(rc *RunContext) common.Executor { diff --git a/act/runner/run_context.go b/act/runner/run_context.go index 86500854..f6978b64 100644 --- a/act/runner/run_context.go +++ b/act/runner/run_context.go @@ -21,10 +21,10 @@ import ( "text/template" "time" - "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" + "code.forgejo.org/forgejo/runner/v11/act/common" + "code.forgejo.org/forgejo/runner/v11/act/container" + "code.forgejo.org/forgejo/runner/v11/act/exprparser" + "code.forgejo.org/forgejo/runner/v11/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 33f77466..110afb45 100644 --- a/act/runner/run_context_test.go +++ b/act/runner/run_context_test.go @@ -11,10 +11,10 @@ import ( "testing" "time" - "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" + "code.forgejo.org/forgejo/runner/v11/act/container" + "code.forgejo.org/forgejo/runner/v11/act/exprparser" + "code.forgejo.org/forgejo/runner/v11/act/model" + "code.forgejo.org/forgejo/runner/v11/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 29b4cc7a..8e8fba3a 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/v9/act/common" - "code.forgejo.org/forgejo/runner/v9/act/model" + "code.forgejo.org/forgejo/runner/v11/act/common" + "code.forgejo.org/forgejo/runner/v11/act/model" ) // Runner provides capabilities to run GitHub actions diff --git a/act/runner/runner_test.go b/act/runner/runner_test.go index 7f3b46e9..86c0ad6e 100644 --- a/act/runner/runner_test.go +++ b/act/runner/runner_test.go @@ -18,8 +18,8 @@ import ( "github.com/stretchr/testify/require" "go.yaml.in/yaml/v3" - "code.forgejo.org/forgejo/runner/v9/act/common" - "code.forgejo.org/forgejo/runner/v9/act/model" + "code.forgejo.org/forgejo/runner/v11/act/common" + "code.forgejo.org/forgejo/runner/v11/act/model" ) var ( diff --git a/act/runner/step.go b/act/runner/step.go index 57f37f89..25c67cfd 100644 --- a/act/runner/step.go +++ b/act/runner/step.go @@ -12,10 +12,10 @@ import ( "strings" "time" - "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" + "code.forgejo.org/forgejo/runner/v11/act/common" + "code.forgejo.org/forgejo/runner/v11/act/container" + "code.forgejo.org/forgejo/runner/v11/act/exprparser" + "code.forgejo.org/forgejo/runner/v11/act/model" "github.com/sirupsen/logrus" ) diff --git a/act/runner/step_action_local.go b/act/runner/step_action_local.go index e6529cc0..ef44e1c2 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/v9/act/common" - "code.forgejo.org/forgejo/runner/v9/act/model" + "code.forgejo.org/forgejo/runner/v11/act/common" + "code.forgejo.org/forgejo/runner/v11/act/model" ) type stepActionLocal struct { diff --git a/act/runner/step_action_local_test.go b/act/runner/step_action_local_test.go index d9bfdd3f..6286305a 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/v9/act/common" - "code.forgejo.org/forgejo/runner/v9/act/model" + "code.forgejo.org/forgejo/runner/v11/act/common" + "code.forgejo.org/forgejo/runner/v11/act/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "go.yaml.in/yaml/v3" diff --git a/act/runner/step_action_remote.go b/act/runner/step_action_remote.go index 515320a7..9051c812 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/v9/act/common" - "code.forgejo.org/forgejo/runner/v9/act/common/git" - "code.forgejo.org/forgejo/runner/v9/act/model" + "code.forgejo.org/forgejo/runner/v11/act/common" + "code.forgejo.org/forgejo/runner/v11/act/common/git" + "code.forgejo.org/forgejo/runner/v11/act/model" ) type stepActionRemote struct { diff --git a/act/runner/step_action_remote_test.go b/act/runner/step_action_remote_test.go index 6c1a4db7..fb302da5 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" "go.yaml.in/yaml/v3" - "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" + "code.forgejo.org/forgejo/runner/v11/act/common" + "code.forgejo.org/forgejo/runner/v11/act/common/git" + "code.forgejo.org/forgejo/runner/v11/act/model" ) type stepActionRemoteMocks struct { diff --git a/act/runner/step_docker.go b/act/runner/step_docker.go index 24cb467d..6f652674 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/v9/act/common" - "code.forgejo.org/forgejo/runner/v9/act/container" - "code.forgejo.org/forgejo/runner/v9/act/model" + "code.forgejo.org/forgejo/runner/v11/act/common" + "code.forgejo.org/forgejo/runner/v11/act/container" + "code.forgejo.org/forgejo/runner/v11/act/model" "github.com/kballard/go-shellquote" ) diff --git a/act/runner/step_docker_test.go b/act/runner/step_docker_test.go index c4f2b94f..1ba08858 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/v9/act/container" - "code.forgejo.org/forgejo/runner/v9/act/model" + "code.forgejo.org/forgejo/runner/v11/act/container" + "code.forgejo.org/forgejo/runner/v11/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 6435d37e..e791c99b 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/v9/act/model" + "code.forgejo.org/forgejo/runner/v11/act/model" ) type stepFactory interface { diff --git a/act/runner/step_factory_test.go b/act/runner/step_factory_test.go index af8cf968..3a434bf9 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/v9/act/model" + "code.forgejo.org/forgejo/runner/v11/act/model" "github.com/stretchr/testify/assert" ) diff --git a/act/runner/step_run.go b/act/runner/step_run.go index 23e45a92..524314ca 100644 --- a/act/runner/step_run.go +++ b/act/runner/step_run.go @@ -9,10 +9,10 @@ import ( "github.com/kballard/go-shellquote" - "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" + "code.forgejo.org/forgejo/runner/v11/act/common" + "code.forgejo.org/forgejo/runner/v11/act/container" + "code.forgejo.org/forgejo/runner/v11/act/lookpath" + "code.forgejo.org/forgejo/runner/v11/act/model" ) type stepRun struct { diff --git a/act/runner/step_run_test.go b/act/runner/step_run_test.go index 1fe376f2..3246c433 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/v9/act/container" - "code.forgejo.org/forgejo/runner/v9/act/model" + "code.forgejo.org/forgejo/runner/v11/act/container" + "code.forgejo.org/forgejo/runner/v11/act/model" ) func TestStepRun(t *testing.T) { diff --git a/act/runner/step_test.go b/act/runner/step_test.go index 74b83c6c..779e9966 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/v9/act/common" - "code.forgejo.org/forgejo/runner/v9/act/model" + "code.forgejo.org/forgejo/runner/v11/act/common" + "code.forgejo.org/forgejo/runner/v11/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 12161f42..d5659438 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module code.forgejo.org/forgejo/runner/v9 +module code.forgejo.org/forgejo/runner/v11 go 1.24 diff --git a/internal/app/cmd/cache-server.go b/internal/app/cmd/cache-server.go index ff233f19..36346d6e 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/v9/internal/pkg/config" + "code.forgejo.org/forgejo/runner/v11/internal/pkg/config" - "code.forgejo.org/forgejo/runner/v9/act/artifactcache" + "code.forgejo.org/forgejo/runner/v11/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 2f9bd3e4..e8db01de 100644 --- a/internal/app/cmd/cmd.go +++ b/internal/app/cmd/cmd.go @@ -10,9 +10,9 @@ import ( "github.com/spf13/cobra" - "code.forgejo.org/forgejo/runner/v9/internal/pkg/common" - "code.forgejo.org/forgejo/runner/v9/internal/pkg/config" - "code.forgejo.org/forgejo/runner/v9/internal/pkg/ver" + "code.forgejo.org/forgejo/runner/v11/internal/pkg/common" + "code.forgejo.org/forgejo/runner/v11/internal/pkg/config" + "code.forgejo.org/forgejo/runner/v11/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 0eeb713b..2a811b0a 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/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" + "code.forgejo.org/forgejo/runner/v11/internal/app/run" + "code.forgejo.org/forgejo/runner/v11/internal/pkg/client" + "code.forgejo.org/forgejo/runner/v11/internal/pkg/config" + "code.forgejo.org/forgejo/runner/v11/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 9da01ae1..546a5d87 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/v9/internal/pkg/client" - "code.forgejo.org/forgejo/runner/v9/internal/pkg/config" - "code.forgejo.org/forgejo/runner/v9/internal/pkg/ver" + "code.forgejo.org/forgejo/runner/v11/internal/pkg/client" + "code.forgejo.org/forgejo/runner/v11/internal/pkg/config" + "code.forgejo.org/forgejo/runner/v11/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 22fd8c26..cb3d278a 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/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" + "code.forgejo.org/forgejo/runner/v11/internal/app/poll" + "code.forgejo.org/forgejo/runner/v11/internal/app/run" + "code.forgejo.org/forgejo/runner/v11/internal/pkg/client" + "code.forgejo.org/forgejo/runner/v11/internal/pkg/config" + "code.forgejo.org/forgejo/runner/v11/internal/pkg/envcheck" + "code.forgejo.org/forgejo/runner/v11/internal/pkg/labels" + "code.forgejo.org/forgejo/runner/v11/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 a0694805..440387cf 100644 --- a/internal/app/cmd/exec.go +++ b/internal/app/cmd/exec.go @@ -14,10 +14,10 @@ import ( "strings" "time" - "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" + "code.forgejo.org/forgejo/runner/v11/act/artifactcache" + "code.forgejo.org/forgejo/runner/v11/act/common" + "code.forgejo.org/forgejo/runner/v11/act/model" + "code.forgejo.org/forgejo/runner/v11/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 3be1f635..d2e2c103 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/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" + "code.forgejo.org/forgejo/runner/v11/internal/app/job" + "code.forgejo.org/forgejo/runner/v11/internal/app/run" + "code.forgejo.org/forgejo/runner/v11/internal/pkg/client" + "code.forgejo.org/forgejo/runner/v11/internal/pkg/config" + "code.forgejo.org/forgejo/runner/v11/internal/pkg/envcheck" + "code.forgejo.org/forgejo/runner/v11/internal/pkg/labels" + "code.forgejo.org/forgejo/runner/v11/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 588490e8..c83b122c 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/v9/testutils" + "code.forgejo.org/forgejo/runner/v11/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 a6a3d2cf..03831822 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/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" + "code.forgejo.org/forgejo/runner/v11/internal/pkg/client" + "code.forgejo.org/forgejo/runner/v11/internal/pkg/config" + "code.forgejo.org/forgejo/runner/v11/internal/pkg/labels" + "code.forgejo.org/forgejo/runner/v11/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 3285ff6f..ca5ab732 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/v9/act/model" - "code.forgejo.org/forgejo/runner/v9/testutils" + "code.forgejo.org/forgejo/runner/v11/act/model" + "code.forgejo.org/forgejo/runner/v11/testutils" "github.com/spf13/cobra" ) diff --git a/internal/app/job/job.go b/internal/app/job/job.go index 2dd06852..6babd498 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/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/v11/internal/app/run" + "code.forgejo.org/forgejo/runner/v11/internal/pkg/client" + "code.forgejo.org/forgejo/runner/v11/internal/pkg/config" ) type Job struct { diff --git a/internal/app/job/job_test.go b/internal/app/job/job_test.go index 9799425b..225d744c 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/v9/internal/pkg/config" + "code.forgejo.org/forgejo/runner/v11/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 5a4061f8..452f356d 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/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/v11/internal/app/run" + "code.forgejo.org/forgejo/runner/v11/internal/pkg/client" + "code.forgejo.org/forgejo/runner/v11/internal/pkg/config" ) const PollerID = "PollerID" diff --git a/internal/app/poll/poller_test.go b/internal/app/poll/poller_test.go index 7c8b7633..e3b23eb3 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/v9/internal/pkg/config" + "code.forgejo.org/forgejo/runner/v11/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 08682d1f..98e1c524 100644 --- a/internal/app/run/runner.go +++ b/internal/app/run/runner.go @@ -17,20 +17,20 @@ import ( "time" runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1" - "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" + "code.forgejo.org/forgejo/runner/v11/act/artifactcache" + "code.forgejo.org/forgejo/runner/v11/act/cacheproxy" + "code.forgejo.org/forgejo/runner/v11/act/common" + "code.forgejo.org/forgejo/runner/v11/act/model" + "code.forgejo.org/forgejo/runner/v11/act/runner" "connectrpc.com/connect" "github.com/docker/docker/api/types/container" log "github.com/sirupsen/logrus" - "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" + "code.forgejo.org/forgejo/runner/v11/internal/pkg/client" + "code.forgejo.org/forgejo/runner/v11/internal/pkg/config" + "code.forgejo.org/forgejo/runner/v11/internal/pkg/labels" + "code.forgejo.org/forgejo/runner/v11/internal/pkg/report" + "code.forgejo.org/forgejo/runner/v11/internal/pkg/ver" ) // Runner runs the pipeline. diff --git a/internal/app/run/runner_test.go b/internal/app/run/runner_test.go index 92e96452..b324b0f5 100644 --- a/internal/app/run/runner_test.go +++ b/internal/app/run/runner_test.go @@ -9,9 +9,9 @@ import ( pingv1 "code.forgejo.org/forgejo/actions-proto/ping/v1" runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1" - "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/v11/internal/pkg/config" + "code.forgejo.org/forgejo/runner/v11/internal/pkg/labels" + "code.forgejo.org/forgejo/runner/v11/internal/pkg/report" "connectrpc.com/connect" "google.golang.org/protobuf/types/known/structpb" diff --git a/internal/app/run/workflow.go b/internal/app/run/workflow.go index 2a0b3a0c..155eddb4 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/v9/act/model" + "code.forgejo.org/forgejo/runner/v11/act/model" "go.yaml.in/yaml/v3" ) diff --git a/internal/app/run/workflow_test.go b/internal/app/run/workflow_test.go index f0ac579c..c98d85f6 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/v9/act/model" + "code.forgejo.org/forgejo/runner/v11/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 42afe8e0..68fa3db4 100644 --- a/internal/pkg/report/reporter.go +++ b/internal/pkg/report/reporter.go @@ -19,8 +19,8 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/timestamppb" - "code.forgejo.org/forgejo/runner/v9/internal/pkg/client" - "code.forgejo.org/forgejo/runner/v9/internal/pkg/common" + "code.forgejo.org/forgejo/runner/v11/internal/pkg/client" + "code.forgejo.org/forgejo/runner/v11/internal/pkg/common" ) var ( diff --git a/internal/pkg/report/reporter_test.go b/internal/pkg/report/reporter_test.go index 246d1699..bbb084b1 100644 --- a/internal/pkg/report/reporter_test.go +++ b/internal/pkg/report/reporter_test.go @@ -20,9 +20,9 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/types/known/structpb" - "code.forgejo.org/forgejo/runner/v9/internal/pkg/client/mocks" - "code.forgejo.org/forgejo/runner/v9/internal/pkg/common" - "code.forgejo.org/forgejo/runner/v9/testutils" + "code.forgejo.org/forgejo/runner/v11/internal/pkg/client/mocks" + "code.forgejo.org/forgejo/runner/v11/internal/pkg/common" + "code.forgejo.org/forgejo/runner/v11/testutils" ) func rowsToString(rows []*runnerv1.LogRow) string { diff --git a/internal/pkg/ver/version.go b/internal/pkg/ver/version.go index 9efc8739..7be5cca1 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/v9/internal/pkg/ver.version=1.2.3" +// go build -ldflags "-X code.forgejo.org/forgejo/runner/v11/internal/pkg/ver.version=1.2.3" var version = "dev" func Version() string { diff --git a/main.go b/main.go index 498bd129..1356572f 100644 --- a/main.go +++ b/main.go @@ -8,7 +8,7 @@ import ( "os/signal" "syscall" - "code.forgejo.org/forgejo/runner/v9/internal/app/cmd" + "code.forgejo.org/forgejo/runner/v11/internal/app/cmd" ) func main() {