oss/forgejo-runner
oss/forgejo-runner
1
0
Fork 0
mirror of https://code.forgejo.org/forgejo/runner.git synced 2025-08-06 17:40:58 +00:00
Code Wiki Activity

chore: to allow the runner to be imported, v9 needs to be in the go module (#777)

Browse source 
It will be imported by Forgejo.

<!--start release-notes-assistant-->
<!--URL:https://code.forgejo.org/forgejo/runner-->
- other
  - [PR](https://code.forgejo.org/forgejo/runner/pulls/777): <!--number 777 --><!--line 0 --><!--description Y2hvcmU6IHRvIGFsbG93IHRoZSBydW5uZXIgdG8gYmUgaW1wb3J0ZWQsIHY5IG5lZWRzIHRvIGJlIGluIHRoZSBnbyBtb2R1bGU=-->chore: to allow the runner to be imported, v9 needs to be in the go module<!--description-->
<!--end release-notes-assistant-->

Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/777
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
Co-authored-by: Earl Warren <contact@earl-warren.org>
Co-committed-by: Earl Warren <contact@earl-warren.org>
This commit is contained in:
Earl Warren 2025-07-31 10:35:11 +00:00 • committed by earl-warren
parent f94fe37f90
commit ec99579451
No known key found for this signature in database
GPG key ID: F128CBE6AB3A7201
84 changed files with 172 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -62,10 +62,10 @@ else
endif endif
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 ?= 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 all: build

4
act/artifactcache/handler.go
View file

@ -20,8 +20,8 @@ import (
"github.com/timshannon/bolthold" "github.com/timshannon/bolthold"
"go.etcd.io/bbolt" "go.etcd.io/bbolt"
"code.forgejo.org/forgejo/runner/act/cacheproxy" "code.forgejo.org/forgejo/runner/v9/act/cacheproxy"
"code.forgejo.org/forgejo/runner/act/common" "code.forgejo.org/forgejo/runner/v9/act/common"
) )
const ( const (

2
act/artifactcache/mac.go
View file

@ -11,7 +11,7 @@ import (
"strconv" "strconv"
"time" "time"
"code.forgejo.org/forgejo/runner/act/cacheproxy" "code.forgejo.org/forgejo/runner/v9/act/cacheproxy"
) )
var ErrValidation = errors.New("validation error") var ErrValidation = errors.New("validation error")

2
act/artifactcache/mac_test.go
View file

@ -5,7 +5,7 @@ import (
"testing" "testing"
"time" "time"
"code.forgejo.org/forgejo/runner/act/cacheproxy" "code.forgejo.org/forgejo/runner/v9/act/cacheproxy"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

2
act/cacheproxy/handler.go
View file

@ -22,7 +22,7 @@ import (
"github.com/julienschmidt/httprouter" "github.com/julienschmidt/httprouter"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"code.forgejo.org/forgejo/runner/act/common" "code.forgejo.org/forgejo/runner/v9/act/common"
) )
const ( const (

2
act/common/git/git.go
View file

@ -19,7 +19,7 @@ import (
"github.com/mattn/go-isatty" "github.com/mattn/go-isatty"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"code.forgejo.org/forgejo/runner/act/common" "code.forgejo.org/forgejo/runner/v9/act/common"
) )
var ( var (

2
act/common/git/git_test.go
View file

@ -13,7 +13,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "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) { func TestFindGitSlug(t *testing.T) {

2
act/container/container_types.go
View file

@ -4,7 +4,7 @@ import (
"context" "context"
"io" "io"
"code.forgejo.org/forgejo/runner/act/common" "code.forgejo.org/forgejo/runner/v9/act/common"
"github.com/docker/go-connections/nat" "github.com/docker/go-connections/nat"
) )

2
act/container/docker_auth.go
View file

@ -6,7 +6,7 @@ import (
"context" "context"
"strings" "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"
"github.com/docker/cli/cli/config/credentials" "github.com/docker/cli/cli/config/credentials"
"github.com/docker/docker/api/types/registry" "github.com/docker/docker/api/types/registry"

2
act/container/docker_build.go
View file

@ -14,7 +14,7 @@ import (
"github.com/moby/patternmatcher" "github.com/moby/patternmatcher"
"github.com/moby/patternmatcher/ignorefile" "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 // NewDockerBuildExecutor function to create a run executor for the container

2
act/container/docker_network.go
View file

@ -5,7 +5,7 @@ package container
import ( import (
"context" "context"
"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/network"
) )

2
act/container/docker_pull.go
View file

@ -13,7 +13,7 @@ import (
"github.com/docker/docker/api/types/image" "github.com/docker/docker/api/types/image"
"github.com/docker/docker/api/types/registry" "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 // NewDockerPullExecutor function to create a run executor for the container

4
act/container/docker_run.go
View file

@ -37,8 +37,8 @@ import (
"github.com/spf13/pflag" "github.com/spf13/pflag"
"golang.org/x/term" "golang.org/x/term"
"code.forgejo.org/forgejo/runner/act/common" "code.forgejo.org/forgejo/runner/v9/act/common"
"code.forgejo.org/forgejo/runner/act/filecollector" "code.forgejo.org/forgejo/runner/v9/act/filecollector"
) )
// NewContainer creates a reference to a container // NewContainer creates a reference to a container

2
act/container/docker_run_test.go
View file

@ -11,7 +11,7 @@ import (
"testing" "testing"
"time" "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"
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"

2
act/container/docker_stub.go
View file

@ -6,7 +6,7 @@ import (
"context" "context"
"runtime" "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/network"
"github.com/docker/docker/api/types/system" "github.com/docker/docker/api/types/system"
"github.com/pkg/errors" "github.com/pkg/errors"

2
act/container/docker_volume.go
View file

@ -5,7 +5,7 @@ package container
import ( import (
"context" "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/filters"
"github.com/docker/docker/api/types/volume" "github.com/docker/docker/api/types/volume"
) )

6
act/container/host_environment.go
View file

@ -20,9 +20,9 @@ import (
"github.com/go-git/go-git/v5/plumbing/format/gitignore" "github.com/go-git/go-git/v5/plumbing/format/gitignore"
"golang.org/x/term" "golang.org/x/term"
"code.forgejo.org/forgejo/runner/act/common" "code.forgejo.org/forgejo/runner/v9/act/common"
"code.forgejo.org/forgejo/runner/act/filecollector" "code.forgejo.org/forgejo/runner/v9/act/filecollector"
"code.forgejo.org/forgejo/runner/act/lookpath" "code.forgejo.org/forgejo/runner/v9/act/lookpath"
) )
type HostEnvironment struct { type HostEnvironment struct {

2
act/container/parse_env_file.go
View file

@ -8,7 +8,7 @@ import (
"io" "io"
"strings" "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 { func parseEnvFile(e Container, srcPath string, env *map[string]string) common.Executor {

2
act/exprparser/functions.go
View file

@ -15,7 +15,7 @@ import (
"github.com/go-git/go-git/v5/plumbing/format/gitignore" "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" "github.com/rhysd/actionlint"
) )

2
act/exprparser/functions_test.go
View file

@ -4,7 +4,7 @@ import (
"path/filepath" "path/filepath"
"testing" "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/assert"
) )

2
act/exprparser/interpreter.go
View file

@ -7,7 +7,7 @@ import (
"reflect" "reflect"
"strings" "strings"
"code.forgejo.org/forgejo/runner/act/model" "code.forgejo.org/forgejo/runner/v9/act/model"
"github.com/rhysd/actionlint" "github.com/rhysd/actionlint"
) )

2
act/exprparser/interpreter_test.go
View file

@ -4,7 +4,7 @@ import (
"math" "math"
"testing" "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/assert"
) )

2
act/jobparser/evaluator.go
View file

@ -5,7 +5,7 @@ import (
"regexp" "regexp"
"strings" "strings"
"code.forgejo.org/forgejo/runner/act/exprparser" "code.forgejo.org/forgejo/runner/v9/act/exprparser"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
) )

4
act/jobparser/interpeter.go
View file

@ -1,8 +1,8 @@
package jobparser package jobparser
import ( import (
"code.forgejo.org/forgejo/runner/act/exprparser" "code.forgejo.org/forgejo/runner/v9/act/exprparser"
"code.forgejo.org/forgejo/runner/act/model" "code.forgejo.org/forgejo/runner/v9/act/model"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
) )

2
act/jobparser/jobparser.go
View file

@ -8,7 +8,7 @@ import (
"gopkg.in/yaml.v3" "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) { func Parse(content []byte, validate bool, options ...ParseOption) ([]*SingleWorkflow, error) {

2
act/jobparser/model.go
View file

@ -3,7 +3,7 @@ package jobparser
import ( import (
"fmt" "fmt"
"code.forgejo.org/forgejo/runner/act/model" "code.forgejo.org/forgejo/runner/v9/act/model"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
) )

2
act/jobparser/model_test.go
View file

@ -5,7 +5,7 @@ import (
"strings" "strings"
"testing" "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/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"

2
act/jobparser/testdata_test.go
View file

@ -6,7 +6,7 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
"code.forgejo.org/forgejo/runner/act/model" "code.forgejo.org/forgejo/runner/v9/act/model"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

2
act/model/action.go
View file

@ -5,7 +5,7 @@ import (
"io" "io"
"strings" "strings"
"code.forgejo.org/forgejo/runner/act/schema" "code.forgejo.org/forgejo/runner/v9/act/schema"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
) )

4
act/model/github_context.go
View file

@ -5,8 +5,8 @@ import (
"fmt" "fmt"
"strings" "strings"
"code.forgejo.org/forgejo/runner/act/common" "code.forgejo.org/forgejo/runner/v9/act/common"
"code.forgejo.org/forgejo/runner/act/common/git" "code.forgejo.org/forgejo/runner/v9/act/common/git"
) )
type GithubContext struct { type GithubContext struct {

4
act/model/workflow.go
View file

@ -10,8 +10,8 @@ import (
"strconv" "strconv"
"strings" "strings"
"code.forgejo.org/forgejo/runner/act/common" "code.forgejo.org/forgejo/runner/v9/act/common"
"code.forgejo.org/forgejo/runner/act/schema" "code.forgejo.org/forgejo/runner/v9/act/schema"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
) )

6
act/runner/action.go
View file

@ -16,9 +16,9 @@ import (
"github.com/kballard/go-shellquote" "github.com/kballard/go-shellquote"
"code.forgejo.org/forgejo/runner/act/common" "code.forgejo.org/forgejo/runner/v9/act/common"
"code.forgejo.org/forgejo/runner/act/container" "code.forgejo.org/forgejo/runner/v9/act/container"
"code.forgejo.org/forgejo/runner/act/model" "code.forgejo.org/forgejo/runner/v9/act/model"
) )
type actionStep interface { type actionStep interface {

2
act/runner/action_cache.go
View file

@ -18,7 +18,7 @@ import (
"github.com/go-git/go-git/v5/plumbing/transport" "github.com/go-git/go-git/v5/plumbing/transport"
"github.com/go-git/go-git/v5/plumbing/transport/http" "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 { type ActionCache interface {

4
act/runner/action_composite.go
View file

@ -6,8 +6,8 @@ import (
"regexp" "regexp"
"strings" "strings"
"code.forgejo.org/forgejo/runner/act/common" "code.forgejo.org/forgejo/runner/v9/act/common"
"code.forgejo.org/forgejo/runner/act/model" "code.forgejo.org/forgejo/runner/v9/act/model"
) )
func evaluateCompositeInputAndEnv(ctx context.Context, parent *RunContext, step actionStep) map[string]string { func evaluateCompositeInputAndEnv(ctx context.Context, parent *RunContext, step actionStep) map[string]string {

2
act/runner/action_test.go
View file

@ -7,7 +7,7 @@ import (
"strings" "strings"
"testing" "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/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
) )

2
act/runner/command.go
View file

@ -5,7 +5,7 @@ import (
"regexp" "regexp"
"strings" "strings"
"code.forgejo.org/forgejo/runner/act/common" "code.forgejo.org/forgejo/runner/v9/act/common"
) )
var ( var (

4
act/runner/command_test.go
View file

@ -10,8 +10,8 @@ import (
"github.com/sirupsen/logrus/hooks/test" "github.com/sirupsen/logrus/hooks/test"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"code.forgejo.org/forgejo/runner/act/common" "code.forgejo.org/forgejo/runner/v9/act/common"
"code.forgejo.org/forgejo/runner/act/model" "code.forgejo.org/forgejo/runner/v9/act/model"
) )
func TestCommandSetEnv(t *testing.T) { func TestCommandSetEnv(t *testing.T) {

4
act/runner/container_mock_test.go
View file

@ -4,8 +4,8 @@ import (
"context" "context"
"io" "io"
"code.forgejo.org/forgejo/runner/act/common" "code.forgejo.org/forgejo/runner/v9/act/common"
"code.forgejo.org/forgejo/runner/act/container" "code.forgejo.org/forgejo/runner/v9/act/container"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
) )

8
act/runner/expression.go
View file

@ -12,10 +12,10 @@ import (
_ "embed" _ "embed"
"code.forgejo.org/forgejo/runner/act/common" "code.forgejo.org/forgejo/runner/v9/act/common"
"code.forgejo.org/forgejo/runner/act/container" "code.forgejo.org/forgejo/runner/v9/act/container"
"code.forgejo.org/forgejo/runner/act/exprparser" "code.forgejo.org/forgejo/runner/v9/act/exprparser"
"code.forgejo.org/forgejo/runner/act/model" "code.forgejo.org/forgejo/runner/v9/act/model"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
) )

4
act/runner/expression_test.go
View file

@ -4,8 +4,8 @@ import (
"context" "context"
"testing" "testing"
"code.forgejo.org/forgejo/runner/act/exprparser" "code.forgejo.org/forgejo/runner/v9/act/exprparser"
"code.forgejo.org/forgejo/runner/act/model" "code.forgejo.org/forgejo/runner/v9/act/model"
assert "github.com/stretchr/testify/assert" assert "github.com/stretchr/testify/assert"
yaml "gopkg.in/yaml.v3" yaml "gopkg.in/yaml.v3"
) )

6
act/runner/job_executor.go
View file

@ -5,9 +5,9 @@ import (
"fmt" "fmt"
"time" "time"
"code.forgejo.org/forgejo/runner/act/common" "code.forgejo.org/forgejo/runner/v9/act/common"
"code.forgejo.org/forgejo/runner/act/container" "code.forgejo.org/forgejo/runner/v9/act/container"
"code.forgejo.org/forgejo/runner/act/model" "code.forgejo.org/forgejo/runner/v9/act/model"
) )
type jobInfo interface { type jobInfo interface {

6
act/runner/job_executor_test.go
View file

@ -6,9 +6,9 @@ import (
"io" "io"
"testing" "testing"
"code.forgejo.org/forgejo/runner/act/common" "code.forgejo.org/forgejo/runner/v9/act/common"
"code.forgejo.org/forgejo/runner/act/container" "code.forgejo.org/forgejo/runner/v9/act/container"
"code.forgejo.org/forgejo/runner/act/model" "code.forgejo.org/forgejo/runner/v9/act/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
) )

2
act/runner/local_repository_cache.go
View file

@ -12,7 +12,7 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"code.forgejo.org/forgejo/runner/act/filecollector" "code.forgejo.org/forgejo/runner/v9/act/filecollector"
) )
type LocalRepositoryCache struct { type LocalRepositoryCache struct {

2
act/runner/logger.go
View file

@ -9,7 +9,7 @@ import (
"strings" "strings"
"sync" "sync"
"code.forgejo.org/forgejo/runner/act/common" "code.forgejo.org/forgejo/runner/v9/act/common"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"golang.org/x/term" "golang.org/x/term"

6
act/runner/reusable_workflow.go
View file

@ -12,9 +12,9 @@ import (
"strings" "strings"
"sync" "sync"
"code.forgejo.org/forgejo/runner/act/common" "code.forgejo.org/forgejo/runner/v9/act/common"
"code.forgejo.org/forgejo/runner/act/common/git" "code.forgejo.org/forgejo/runner/v9/act/common/git"
"code.forgejo.org/forgejo/runner/act/model" "code.forgejo.org/forgejo/runner/v9/act/model"
) )
func newLocalReusableWorkflowExecutor(rc *RunContext) common.Executor { func newLocalReusableWorkflowExecutor(rc *RunContext) common.Executor {

8
act/runner/run_context.go
View file

@ -20,10 +20,10 @@ import (
"text/template" "text/template"
"time" "time"
"code.forgejo.org/forgejo/runner/act/common" "code.forgejo.org/forgejo/runner/v9/act/common"
"code.forgejo.org/forgejo/runner/act/container" "code.forgejo.org/forgejo/runner/v9/act/container"
"code.forgejo.org/forgejo/runner/act/exprparser" "code.forgejo.org/forgejo/runner/v9/act/exprparser"
"code.forgejo.org/forgejo/runner/act/model" "code.forgejo.org/forgejo/runner/v9/act/model"
"github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/network"
"github.com/docker/go-connections/nat" "github.com/docker/go-connections/nat"
"github.com/opencontainers/selinux/go-selinux" "github.com/opencontainers/selinux/go-selinux"

8
act/runner/run_context_test.go
View file

@ -10,10 +10,10 @@ import (
"strings" "strings"
"testing" "testing"
"code.forgejo.org/forgejo/runner/act/container" "code.forgejo.org/forgejo/runner/v9/act/container"
"code.forgejo.org/forgejo/runner/act/exprparser" "code.forgejo.org/forgejo/runner/v9/act/exprparser"
"code.forgejo.org/forgejo/runner/act/model" "code.forgejo.org/forgejo/runner/v9/act/model"
"code.forgejo.org/forgejo/runner/testutils" "code.forgejo.org/forgejo/runner/v9/testutils"
"github.com/docker/go-connections/nat" "github.com/docker/go-connections/nat"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"

4
act/runner/runner.go
View file

@ -11,8 +11,8 @@ import (
docker_container "github.com/docker/docker/api/types/container" docker_container "github.com/docker/docker/api/types/container"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"code.forgejo.org/forgejo/runner/act/common" "code.forgejo.org/forgejo/runner/v9/act/common"
"code.forgejo.org/forgejo/runner/act/model" "code.forgejo.org/forgejo/runner/v9/act/model"
) )
// Runner provides capabilities to run GitHub actions // Runner provides capabilities to run GitHub actions

4
act/runner/runner_test.go
View file

@ -16,8 +16,8 @@ import (
assert "github.com/stretchr/testify/assert" assert "github.com/stretchr/testify/assert"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
"code.forgejo.org/forgejo/runner/act/common" "code.forgejo.org/forgejo/runner/v9/act/common"
"code.forgejo.org/forgejo/runner/act/model" "code.forgejo.org/forgejo/runner/v9/act/model"
) )
var ( var (

8
act/runner/step.go
View file

@ -8,10 +8,10 @@ import (
"strings" "strings"
"time" "time"
"code.forgejo.org/forgejo/runner/act/common" "code.forgejo.org/forgejo/runner/v9/act/common"
"code.forgejo.org/forgejo/runner/act/container" "code.forgejo.org/forgejo/runner/v9/act/container"
"code.forgejo.org/forgejo/runner/act/exprparser" "code.forgejo.org/forgejo/runner/v9/act/exprparser"
"code.forgejo.org/forgejo/runner/act/model" "code.forgejo.org/forgejo/runner/v9/act/model"
) )
type step interface { type step interface {

4
act/runner/step_action_local.go
View file

@ -11,8 +11,8 @@ import (
"path" "path"
"path/filepath" "path/filepath"
"code.forgejo.org/forgejo/runner/act/common" "code.forgejo.org/forgejo/runner/v9/act/common"
"code.forgejo.org/forgejo/runner/act/model" "code.forgejo.org/forgejo/runner/v9/act/model"
) )
type stepActionLocal struct { type stepActionLocal struct {

4
act/runner/step_action_local_test.go
View file

@ -8,8 +8,8 @@ import (
"strings" "strings"
"testing" "testing"
"code.forgejo.org/forgejo/runner/act/common" "code.forgejo.org/forgejo/runner/v9/act/common"
"code.forgejo.org/forgejo/runner/act/model" "code.forgejo.org/forgejo/runner/v9/act/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"

6
act/runner/step_action_remote.go
View file

@ -14,9 +14,9 @@ import (
gogit "github.com/go-git/go-git/v5" gogit "github.com/go-git/go-git/v5"
"code.forgejo.org/forgejo/runner/act/common" "code.forgejo.org/forgejo/runner/v9/act/common"
"code.forgejo.org/forgejo/runner/act/common/git" "code.forgejo.org/forgejo/runner/v9/act/common/git"
"code.forgejo.org/forgejo/runner/act/model" "code.forgejo.org/forgejo/runner/v9/act/model"
) )
type stepActionRemote struct { type stepActionRemote struct {

6
act/runner/step_action_remote_test.go
View file

@ -11,9 +11,9 @@ import (
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
"code.forgejo.org/forgejo/runner/act/common" "code.forgejo.org/forgejo/runner/v9/act/common"
"code.forgejo.org/forgejo/runner/act/common/git" "code.forgejo.org/forgejo/runner/v9/act/common/git"
"code.forgejo.org/forgejo/runner/act/model" "code.forgejo.org/forgejo/runner/v9/act/model"
) )
type stepActionRemoteMocks struct { type stepActionRemoteMocks struct {

6
act/runner/step_docker.go
View file

@ -5,9 +5,9 @@ import (
"fmt" "fmt"
"strings" "strings"
"code.forgejo.org/forgejo/runner/act/common" "code.forgejo.org/forgejo/runner/v9/act/common"
"code.forgejo.org/forgejo/runner/act/container" "code.forgejo.org/forgejo/runner/v9/act/container"
"code.forgejo.org/forgejo/runner/act/model" "code.forgejo.org/forgejo/runner/v9/act/model"
"github.com/kballard/go-shellquote" "github.com/kballard/go-shellquote"
) )

4
act/runner/step_docker_test.go
View file

@ -6,8 +6,8 @@ import (
"io" "io"
"testing" "testing"
"code.forgejo.org/forgejo/runner/act/container" "code.forgejo.org/forgejo/runner/v9/act/container"
"code.forgejo.org/forgejo/runner/act/model" "code.forgejo.org/forgejo/runner/v9/act/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
) )

2
act/runner/step_factory.go
View file

@ -3,7 +3,7 @@ package runner
import ( import (
"fmt" "fmt"
"code.forgejo.org/forgejo/runner/act/model" "code.forgejo.org/forgejo/runner/v9/act/model"
) )
type stepFactory interface { type stepFactory interface {

2
act/runner/step_factory_test.go
View file

@ -3,7 +3,7 @@ package runner
import ( import (
"testing" "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/assert"
) )

8
act/runner/step_run.go
View file

@ -8,10 +8,10 @@ import (
"github.com/kballard/go-shellquote" "github.com/kballard/go-shellquote"
"code.forgejo.org/forgejo/runner/act/common" "code.forgejo.org/forgejo/runner/v9/act/common"
"code.forgejo.org/forgejo/runner/act/container" "code.forgejo.org/forgejo/runner/v9/act/container"
"code.forgejo.org/forgejo/runner/act/lookpath" "code.forgejo.org/forgejo/runner/v9/act/lookpath"
"code.forgejo.org/forgejo/runner/act/model" "code.forgejo.org/forgejo/runner/v9/act/model"
) )
type stepRun struct { type stepRun struct {

4
act/runner/step_run_test.go
View file

@ -9,8 +9,8 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
"code.forgejo.org/forgejo/runner/act/container" "code.forgejo.org/forgejo/runner/v9/act/container"
"code.forgejo.org/forgejo/runner/act/model" "code.forgejo.org/forgejo/runner/v9/act/model"
) )
func TestStepRun(t *testing.T) { func TestStepRun(t *testing.T) {

4
act/runner/step_test.go
View file

@ -4,8 +4,8 @@ import (
"context" "context"
"testing" "testing"
"code.forgejo.org/forgejo/runner/act/common" "code.forgejo.org/forgejo/runner/v9/act/common"
"code.forgejo.org/forgejo/runner/act/model" "code.forgejo.org/forgejo/runner/v9/act/model"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"

2
go.mod
View file

@ -1,4 +1,4 @@
module code.forgejo.org/forgejo/runner module code.forgejo.org/forgejo/runner/v9
go 1.23.0 go 1.23.0

4
internal/app/cmd/cache-server.go
View file

@ -9,9 +9,9 @@ import (
"os" "os"
"os/signal" "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" log "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

4
internal/app/cmd/cmd.go
View file

@ -10,8 +10,8 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"code.forgejo.org/forgejo/runner/internal/pkg/config" "code.forgejo.org/forgejo/runner/v9/internal/pkg/config"
"code.forgejo.org/forgejo/runner/internal/pkg/ver" "code.forgejo.org/forgejo/runner/v9/internal/pkg/ver"
) )
func Execute(ctx context.Context) { func Execute(ctx context.Context) {

8
internal/app/cmd/create-runner-file.go
View file

@ -14,10 +14,10 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"code.forgejo.org/forgejo/runner/internal/app/run" "code.forgejo.org/forgejo/runner/v9/internal/app/run"
"code.forgejo.org/forgejo/runner/internal/pkg/client" "code.forgejo.org/forgejo/runner/v9/internal/pkg/client"
"code.forgejo.org/forgejo/runner/internal/pkg/config" "code.forgejo.org/forgejo/runner/v9/internal/pkg/config"
"code.forgejo.org/forgejo/runner/internal/pkg/ver" "code.forgejo.org/forgejo/runner/v9/internal/pkg/ver"
) )
type createRunnerFileArgs struct { type createRunnerFileArgs struct {

6
internal/app/cmd/create-runner-file_test.go
View file

@ -8,9 +8,9 @@ import (
"testing" "testing"
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1" runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1"
"code.forgejo.org/forgejo/runner/internal/pkg/client" "code.forgejo.org/forgejo/runner/v9/internal/pkg/client"
"code.forgejo.org/forgejo/runner/internal/pkg/config" "code.forgejo.org/forgejo/runner/v9/internal/pkg/config"
"code.forgejo.org/forgejo/runner/internal/pkg/ver" "code.forgejo.org/forgejo/runner/v9/internal/pkg/ver"
"connectrpc.com/connect" "connectrpc.com/connect"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"

14
internal/app/cmd/daemon.go
View file

@ -18,13 +18,13 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"code.forgejo.org/forgejo/runner/internal/app/poll" "code.forgejo.org/forgejo/runner/v9/internal/app/poll"
"code.forgejo.org/forgejo/runner/internal/app/run" "code.forgejo.org/forgejo/runner/v9/internal/app/run"
"code.forgejo.org/forgejo/runner/internal/pkg/client" "code.forgejo.org/forgejo/runner/v9/internal/pkg/client"
"code.forgejo.org/forgejo/runner/internal/pkg/config" "code.forgejo.org/forgejo/runner/v9/internal/pkg/config"
"code.forgejo.org/forgejo/runner/internal/pkg/envcheck" "code.forgejo.org/forgejo/runner/v9/internal/pkg/envcheck"
"code.forgejo.org/forgejo/runner/internal/pkg/labels" "code.forgejo.org/forgejo/runner/v9/internal/pkg/labels"
"code.forgejo.org/forgejo/runner/internal/pkg/ver" "code.forgejo.org/forgejo/runner/v9/internal/pkg/ver"
) )
func runDaemon(ctx context.Context, configFile *string) func(cmd *cobra.Command, args []string) error { func runDaemon(ctx context.Context, configFile *string) func(cmd *cobra.Command, args []string) error {

8
internal/app/cmd/exec.go
View file

@ -13,10 +13,10 @@ import (
"strings" "strings"
"time" "time"
"code.forgejo.org/forgejo/runner/act/artifactcache" "code.forgejo.org/forgejo/runner/v9/act/artifactcache"
"code.forgejo.org/forgejo/runner/act/common" "code.forgejo.org/forgejo/runner/v9/act/common"
"code.forgejo.org/forgejo/runner/act/model" "code.forgejo.org/forgejo/runner/v9/act/model"
"code.forgejo.org/forgejo/runner/act/runner" "code.forgejo.org/forgejo/runner/v9/act/runner"
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
"github.com/joho/godotenv" "github.com/joho/godotenv"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"

14
internal/app/cmd/job.go
View file

@ -13,13 +13,13 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"code.forgejo.org/forgejo/runner/internal/app/job" "code.forgejo.org/forgejo/runner/v9/internal/app/job"
"code.forgejo.org/forgejo/runner/internal/app/run" "code.forgejo.org/forgejo/runner/v9/internal/app/run"
"code.forgejo.org/forgejo/runner/internal/pkg/client" "code.forgejo.org/forgejo/runner/v9/internal/pkg/client"
"code.forgejo.org/forgejo/runner/internal/pkg/config" "code.forgejo.org/forgejo/runner/v9/internal/pkg/config"
"code.forgejo.org/forgejo/runner/internal/pkg/envcheck" "code.forgejo.org/forgejo/runner/v9/internal/pkg/envcheck"
"code.forgejo.org/forgejo/runner/internal/pkg/labels" "code.forgejo.org/forgejo/runner/v9/internal/pkg/labels"
"code.forgejo.org/forgejo/runner/internal/pkg/ver" "code.forgejo.org/forgejo/runner/v9/internal/pkg/ver"
) )
func runJob(ctx context.Context, configFile *string) func(cmd *cobra.Command, args []string) error { func runJob(ctx context.Context, configFile *string) func(cmd *cobra.Command, args []string) error {

2
internal/app/cmd/main_test.go
View file

@ -10,7 +10,7 @@ import (
"os" "os"
"testing" "testing"
"code.forgejo.org/forgejo/runner/testutils" "code.forgejo.org/forgejo/runner/v9/testutils"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"

8
internal/app/cmd/register.go
View file

@ -20,10 +20,10 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"code.forgejo.org/forgejo/runner/internal/pkg/client" "code.forgejo.org/forgejo/runner/v9/internal/pkg/client"
"code.forgejo.org/forgejo/runner/internal/pkg/config" "code.forgejo.org/forgejo/runner/v9/internal/pkg/config"
"code.forgejo.org/forgejo/runner/internal/pkg/labels" "code.forgejo.org/forgejo/runner/v9/internal/pkg/labels"
"code.forgejo.org/forgejo/runner/internal/pkg/ver" "code.forgejo.org/forgejo/runner/v9/internal/pkg/ver"
) )
// runRegister registers a runner to the server // runRegister registers a runner to the server

4
internal/app/cmd/validate.go
View file

@ -13,8 +13,8 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"code.forgejo.org/forgejo/runner/act/model" "code.forgejo.org/forgejo/runner/v9/act/model"
"code.forgejo.org/forgejo/runner/testutils" "code.forgejo.org/forgejo/runner/v9/testutils"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

6
internal/app/job/job.go
View file

@ -13,9 +13,9 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1" runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1"
"code.forgejo.org/forgejo/runner/internal/app/run" "code.forgejo.org/forgejo/runner/v9/internal/app/run"
"code.forgejo.org/forgejo/runner/internal/pkg/client" "code.forgejo.org/forgejo/runner/v9/internal/pkg/client"
"code.forgejo.org/forgejo/runner/internal/pkg/config" "code.forgejo.org/forgejo/runner/v9/internal/pkg/config"
) )
type Job struct { type Job struct {

2
internal/app/job/job_test.go
View file

@ -11,7 +11,7 @@ import (
"code.forgejo.org/forgejo/actions-proto/ping/v1/pingv1connect" "code.forgejo.org/forgejo/actions-proto/ping/v1/pingv1connect"
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1" runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1"
"code.forgejo.org/forgejo/actions-proto/runner/v1/runnerv1connect" "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" log "github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"

6
internal/app/poll/poller.go
View file

@ -15,9 +15,9 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"golang.org/x/time/rate" "golang.org/x/time/rate"
"code.forgejo.org/forgejo/runner/internal/app/run" "code.forgejo.org/forgejo/runner/v9/internal/app/run"
"code.forgejo.org/forgejo/runner/internal/pkg/client" "code.forgejo.org/forgejo/runner/v9/internal/pkg/client"
"code.forgejo.org/forgejo/runner/internal/pkg/config" "code.forgejo.org/forgejo/runner/v9/internal/pkg/config"
) )
const PollerID = "PollerID" const PollerID = "PollerID"

2
internal/app/poll/poller_test.go
View file

@ -14,7 +14,7 @@ import (
"code.forgejo.org/forgejo/actions-proto/ping/v1/pingv1connect" "code.forgejo.org/forgejo/actions-proto/ping/v1/pingv1connect"
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1" runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1"
"code.forgejo.org/forgejo/actions-proto/runner/v1/runnerv1connect" "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" log "github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"

20
internal/app/run/runner.go
View file

@ -16,20 +16,20 @@ import (
"time" "time"
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1" runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1"
"code.forgejo.org/forgejo/runner/act/artifactcache" "code.forgejo.org/forgejo/runner/v9/act/artifactcache"
"code.forgejo.org/forgejo/runner/act/cacheproxy" "code.forgejo.org/forgejo/runner/v9/act/cacheproxy"
"code.forgejo.org/forgejo/runner/act/common" "code.forgejo.org/forgejo/runner/v9/act/common"
"code.forgejo.org/forgejo/runner/act/model" "code.forgejo.org/forgejo/runner/v9/act/model"
"code.forgejo.org/forgejo/runner/act/runner" "code.forgejo.org/forgejo/runner/v9/act/runner"
"connectrpc.com/connect" "connectrpc.com/connect"
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"code.forgejo.org/forgejo/runner/internal/pkg/client" "code.forgejo.org/forgejo/runner/v9/internal/pkg/client"
"code.forgejo.org/forgejo/runner/internal/pkg/config" "code.forgejo.org/forgejo/runner/v9/internal/pkg/config"
"code.forgejo.org/forgejo/runner/internal/pkg/labels" "code.forgejo.org/forgejo/runner/v9/internal/pkg/labels"
"code.forgejo.org/forgejo/runner/internal/pkg/report" "code.forgejo.org/forgejo/runner/v9/internal/pkg/report"
"code.forgejo.org/forgejo/runner/internal/pkg/ver" "code.forgejo.org/forgejo/runner/v9/internal/pkg/ver"
) )
// Runner runs the pipeline. // Runner runs the pipeline.

2
internal/app/run/runner_test.go
View file

@ -7,7 +7,7 @@ import (
"testing" "testing"
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1" 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" "github.com/stretchr/testify/assert"
) )

2
internal/app/run/workflow.go
View file

@ -10,7 +10,7 @@ import (
"strings" "strings"
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1" 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" "gopkg.in/yaml.v3"
) )

2
internal/app/run/workflow_test.go
View file

@ -7,7 +7,7 @@ import (
"testing" "testing"
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1" 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" "github.com/stretchr/testify/require"
"gotest.tools/v3/assert" "gotest.tools/v3/assert"
) )

2
internal/pkg/report/reporter.go
View file

@ -19,7 +19,7 @@ import (
"google.golang.org/protobuf/proto" "google.golang.org/protobuf/proto"
"google.golang.org/protobuf/types/known/timestamppb" "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 ( var (

4
internal/pkg/report/reporter_test.go
View file

@ -20,8 +20,8 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"google.golang.org/protobuf/types/known/structpb" "google.golang.org/protobuf/types/known/structpb"
"code.forgejo.org/forgejo/runner/internal/pkg/client/mocks" "code.forgejo.org/forgejo/runner/v9/internal/pkg/client/mocks"
"code.forgejo.org/forgejo/runner/testutils" "code.forgejo.org/forgejo/runner/v9/testutils"
) )
func rowsToString(rows []*runnerv1.LogRow) string { func rowsToString(rows []*runnerv1.LogRow) string {

2
internal/pkg/ver/version.go
View file

@ -3,7 +3,7 @@
package ver 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" var version = "dev"
func Version() string { func Version() string {

2
main.go
View file

@ -8,7 +8,7 @@ import (
"os/signal" "os/signal"
"syscall" "syscall"
"code.forgejo.org/forgejo/runner/internal/app/cmd" "code.forgejo.org/forgejo/runner/v9/internal/app/cmd"
) )
func main() { func main() {