mirror of
https://code.forgejo.org/forgejo/runner.git
synced 2025-08-06 17:40:58 +00:00
chore: to allow the runner to be imported, v9 needs to be in the go module (#777)
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:
parent
f94fe37f90
commit
ec99579451
84 changed files with 172 additions and 172 deletions
4
Makefile
4
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
|
||||
|
||||
|
|
|
@ -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 (
|
||||
|
|
|
@ -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")
|
||||
|
|
|
@ -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"
|
||||
)
|
||||
|
||||
|
|
|
@ -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 (
|
||||
|
|
|
@ -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 (
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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"
|
||||
)
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
)
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
)
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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"
|
||||
)
|
||||
|
||||
|
|
|
@ -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"
|
||||
)
|
||||
|
||||
|
|
|
@ -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"
|
||||
)
|
||||
|
||||
|
|
|
@ -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"
|
||||
)
|
||||
|
||||
|
|
|
@ -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"
|
||||
)
|
||||
|
||||
|
|
|
@ -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"
|
||||
)
|
||||
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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"
|
||||
)
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
)
|
||||
|
|
|
@ -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"
|
||||
)
|
||||
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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"
|
||||
)
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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"
|
||||
)
|
||||
|
|
|
@ -5,7 +5,7 @@ import (
|
|||
"regexp"
|
||||
"strings"
|
||||
|
||||
"code.forgejo.org/forgejo/runner/act/common"
|
||||
"code.forgejo.org/forgejo/runner/v9/act/common"
|
||||
)
|
||||
|
||||
var (
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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"
|
||||
)
|
||||
|
||||
|
|
|
@ -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"
|
||||
)
|
||||
|
||||
|
|
|
@ -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"
|
||||
)
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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"
|
||||
)
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 (
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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"
|
||||
)
|
||||
|
||||
|
|
|
@ -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"
|
||||
)
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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"
|
||||
)
|
||||
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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"
|
||||
|
|
2
go.mod
2
go.mod
|
@ -1,4 +1,4 @@
|
|||
module code.forgejo.org/forgejo/runner
|
||||
module code.forgejo.org/forgejo/runner/v9
|
||||
|
||||
go 1.23.0
|
||||
|
||||
|
|
|
@ -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"
|
||||
)
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
)
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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"
|
||||
)
|
||||
|
|
|
@ -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"
|
||||
)
|
||||
|
||||
|
|
|
@ -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"
|
||||
)
|
||||
|
|
|
@ -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 (
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
2
main.go
2
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() {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue