ink/act_runner
1
1
Fork 0
mirror of https://gitea.com/gitea/act_runner.git synced 2026-03-22 06:45:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

update go imports (#20)

Browse Source 
* Replace nektos/act imports with actions-oss/act-cli

* Update go.mod to reference new repo

* Fix goimports "not properly formatted" complaints.

Replacing the imports left some out of alphabetical order.
This commit is contained in:
Steven Edwards
2025-01-27 12:11:12 -05:00
committed by GitHub
parent 1d135cf8d1
commit 70c9e21c85
58 changed files with 113 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/graph.go
View File

@@ -3,8 +3,8 @@ package cmd
import ( import (
"os" "os"
"github.com/nektos/act/pkg/common" "github.com/actions-oss/act-cli/pkg/common"
"github.com/nektos/act/pkg/model" "github.com/actions-oss/act-cli/pkg/model"
) )
func drawGraph(plan *model.Plan) error { func drawGraph(plan *model.Plan) error {

2
cmd/list.go
View File

@@ -5,7 +5,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/nektos/act/pkg/model" "github.com/actions-oss/act-cli/pkg/model"
) )
func printList(plan *model.Plan) error { func printList(plan *model.Plan) error {

14
cmd/root.go
View File

@@ -23,12 +23,12 @@ import (
"github.com/spf13/cobra/doc" "github.com/spf13/cobra/doc"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
"github.com/nektos/act/pkg/artifactcache" "github.com/actions-oss/act-cli/pkg/artifactcache"
"github.com/nektos/act/pkg/artifacts" "github.com/actions-oss/act-cli/pkg/artifacts"
"github.com/nektos/act/pkg/common" "github.com/actions-oss/act-cli/pkg/common"
"github.com/nektos/act/pkg/container" "github.com/actions-oss/act-cli/pkg/container"
"github.com/nektos/act/pkg/model" "github.com/actions-oss/act-cli/pkg/model"
"github.com/nektos/act/pkg/runner" "github.com/actions-oss/act-cli/pkg/runner"
) )
// Execute is the entry point to running the CLI // Execute is the entry point to running the CLI
@@ -663,7 +663,7 @@ func defaultImageSurvey(actrc string) error {
var answer string var answer string
confirmation := &survey.Select{ confirmation := &survey.Select{
Message: "Please choose the default image you want to use with act:\n - Large size image: ca. 17GB download + 53.1GB storage, you will need 75GB of free disk space, snapshots of GitHub Hosted Runners without snap and pulled docker images\n - Medium size image: ~500MB, includes only necessary tools to bootstrap actions and aims to be compatible with most actions\n - Micro size image: <200MB, contains only NodeJS required to bootstrap actions, doesn't work with all actions\n\nDefault image and other options can be changed manually in " + configLocations()[0] + " (please refer to https://github.com/nektos/act#configuration for additional information about file structure)", Message: "Please choose the default image you want to use with act:\n - Large size image: ca. 17GB download + 53.1GB storage, you will need 75GB of free disk space, snapshots of GitHub Hosted Runners without snap and pulled docker images\n - Medium size image: ~500MB, includes only necessary tools to bootstrap actions and aims to be compatible with most actions\n - Micro size image: <200MB, contains only NodeJS required to bootstrap actions, doesn't work with all actions\n\nDefault image and other options can be changed manually in " + configLocations()[0] + " (please refer to https://github.com/nektos/act#configuration for additional information about file structure)",
Help: "If you want to know why act asks you that, please go to https://github.com/nektos/act/issues/107", Help: "If you want to know why act asks you that, please go to https://github.com/actions-oss/act-cli/issues/107",
Default: "Medium", Default: "Medium",
Options: []string{"Large", "Medium", "Micro"}, Options: []string{"Large", "Medium", "Micro"},
} }

2
go.mod
View File

@@ -1,4 +1,4 @@
module github.com/nektos/act module github.com/actions-oss/act-cli
go 1.23 go 1.23

2
main.go
View File

@@ -7,7 +7,7 @@ import (
"os/signal" "os/signal"
"syscall" "syscall"
"github.com/nektos/act/cmd" "github.com/actions-oss/act-cli/cmd"
) )
//go:embed VERSION //go:embed VERSION

2
pkg/artifactcache/handler.go
View File

@@ -20,7 +20,7 @@ import (
"github.com/timshannon/bolthold" "github.com/timshannon/bolthold"
"go.etcd.io/bbolt" "go.etcd.io/bbolt"
"github.com/nektos/act/pkg/common" "github.com/actions-oss/act-cli/pkg/common"
) )
const ( const (

2
pkg/artifacts/server.go
View File

@@ -15,7 +15,7 @@ import (
"github.com/julienschmidt/httprouter" "github.com/julienschmidt/httprouter"
"github.com/nektos/act/pkg/common" "github.com/actions-oss/act-cli/pkg/common"
) )
type FileContainerResourceURL struct { type FileContainerResourceURL struct {

4
pkg/artifacts/server_test.go
View File

@@ -17,8 +17,8 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/nektos/act/pkg/model" "github.com/actions-oss/act-cli/pkg/model"
"github.com/nektos/act/pkg/runner" "github.com/actions-oss/act-cli/pkg/runner"
) )
type writableMapFile struct { type writableMapFile struct {

2
pkg/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"
"github.com/nektos/act/pkg/common" "github.com/actions-oss/act-cli/pkg/common"
) )
var ( var (

14
pkg/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"
"github.com/nektos/act/pkg/common" "github.com/actions-oss/act-cli/pkg/common"
) )
func TestFindGitSlug(t *testing.T) { func TestFindGitSlug(t *testing.T) {
@@ -26,12 +26,12 @@ func TestFindGitSlug(t *testing.T) {
}{ }{
{"https://git-codecommit.us-east-1.amazonaws.com/v1/repos/my-repo-name", "CodeCommit", "my-repo-name"}, {"https://git-codecommit.us-east-1.amazonaws.com/v1/repos/my-repo-name", "CodeCommit", "my-repo-name"},
{"ssh://git-codecommit.us-west-2.amazonaws.com/v1/repos/my-repo", "CodeCommit", "my-repo"}, {"ssh://git-codecommit.us-west-2.amazonaws.com/v1/repos/my-repo", "CodeCommit", "my-repo"},
{"git@github.com:nektos/act.git", "GitHub", "nektos/act"}, {"git@github.com:actions-oss/act-cli.git", "GitHub", "actions-oss/act-cli"},
{"git@github.com:nektos/act", "GitHub", "nektos/act"}, {"git@github.com:actions-oss/act-cli", "GitHub", "actions-oss/act-cli"},
{"https://github.com/nektos/act.git", "GitHub", "nektos/act"}, {"https://github.com/actions-oss/act-cli.git", "GitHub", "actions-oss/act-cli"},
{"http://github.com/nektos/act.git", "GitHub", "nektos/act"}, {"http://github.com/actions-oss/act-cli.git", "GitHub", "actions-oss/act-cli"},
{"https://github.com/nektos/act", "GitHub", "nektos/act"}, {"https://github.com/actions-oss/act-cli", "GitHub", "actions-oss/act-cli"},
{"http://github.com/nektos/act", "GitHub", "nektos/act"}, {"http://github.com/actions-oss/act-cli", "GitHub", "actions-oss/act-cli"},
{"git+ssh://git@github.com/owner/repo.git", "GitHub", "owner/repo"}, {"git+ssh://git@github.com/owner/repo.git", "GitHub", "owner/repo"},
{"http://myotherrepo.com/act.git", "", "http://myotherrepo.com/act.git"}, {"http://myotherrepo.com/act.git", "", "http://myotherrepo.com/act.git"},
} }

2
pkg/container/container_types.go
View File

@@ -4,8 +4,8 @@ import (
"context" "context"
"io" "io"
"github.com/actions-oss/act-cli/pkg/common"
"github.com/docker/go-connections/nat" "github.com/docker/go-connections/nat"
"github.com/nektos/act/pkg/common"
) )
// NewContainerInput the input for the New function // NewContainerInput the input for the New function

2
pkg/container/docker_auth.go
View File

@@ -6,10 +6,10 @@ import (
"context" "context"
"strings" "strings"
"github.com/actions-oss/act-cli/pkg/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"
"github.com/nektos/act/pkg/common"
) )
func LoadDockerAuthConfig(ctx context.Context, image string) (registry.AuthConfig, error) { func LoadDockerAuthConfig(ctx context.Context, image string) (registry.AuthConfig, error) {

2
pkg/container/docker_build.go
View File

@@ -16,7 +16,7 @@ import (
"github.com/moby/patternmatcher" "github.com/moby/patternmatcher"
"github.com/moby/patternmatcher/ignorefile" "github.com/moby/patternmatcher/ignorefile"
"github.com/nektos/act/pkg/common" "github.com/actions-oss/act-cli/pkg/common"
) )
// NewDockerBuildExecutor function to create a run executor for the container // NewDockerBuildExecutor function to create a run executor for the container

2
pkg/container/docker_network.go
View File

@@ -5,8 +5,8 @@ package container
import ( import (
"context" "context"
"github.com/actions-oss/act-cli/pkg/common"
"github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/network"
"github.com/nektos/act/pkg/common"
) )
func NewDockerNetworkCreateExecutor(name string) common.Executor { func NewDockerNetworkCreateExecutor(name string) common.Executor {

2
pkg/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"
"github.com/nektos/act/pkg/common" "github.com/actions-oss/act-cli/pkg/common"
) )
// NewDockerPullExecutor function to create a run executor for the container // NewDockerPullExecutor function to create a run executor for the container

6
pkg/container/docker_run.go
View File

@@ -35,8 +35,8 @@ import (
"github.com/spf13/pflag" "github.com/spf13/pflag"
"golang.org/x/term" "golang.org/x/term"
"github.com/nektos/act/pkg/common" "github.com/actions-oss/act-cli/pkg/common"
"github.com/nektos/act/pkg/filecollector" "github.com/actions-oss/act-cli/pkg/filecollector"
) )
// NewContainer creates a reference to a container // NewContainer creates a reference to a container
@@ -605,7 +605,7 @@ func (cr *containerReference) exec(cmd []string, env map[string]string, user, wo
case 0: case 0:
return nil return nil
case 127: case 127:
return fmt.Errorf("exitcode '%d': command not found, please refer to https://github.com/nektos/act/issues/107 for more information", inspectResp.ExitCode) return fmt.Errorf("exitcode '%d': command not found, please refer to https://github.com/actions-oss/act-cli/issues/107 for more information", inspectResp.ExitCode)
default: default:
return fmt.Errorf("exitcode '%d': failure", inspectResp.ExitCode) return fmt.Errorf("exitcode '%d': failure", inspectResp.ExitCode)
} }

2
pkg/container/docker_stub.go
View File

@@ -7,7 +7,7 @@ import (
"runtime" "runtime"
"github.com/docker/docker/api/types/system" "github.com/docker/docker/api/types/system"
"github.com/nektos/act/pkg/common" "github.com/actions-oss/act-cli/pkg/common"
"github.com/pkg/errors" "github.com/pkg/errors"
) )

2
pkg/container/docker_volume.go
View File

@@ -5,9 +5,9 @@ package container
import ( import (
"context" "context"
"github.com/actions-oss/act-cli/pkg/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"
"github.com/nektos/act/pkg/common"
) )
func NewDockerVolumeRemoveExecutor(volumeName string, force bool) common.Executor { func NewDockerVolumeRemoveExecutor(volumeName string, force bool) common.Executor {

6
pkg/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"
"github.com/nektos/act/pkg/common" "github.com/actions-oss/act-cli/pkg/common"
"github.com/nektos/act/pkg/filecollector" "github.com/actions-oss/act-cli/pkg/filecollector"
"github.com/nektos/act/pkg/lookpath" "github.com/actions-oss/act-cli/pkg/lookpath"
) )
type HostEnvironment struct { type HostEnvironment struct {

2
pkg/container/parse_env_file.go
View File

@@ -8,7 +8,7 @@ import (
"io" "io"
"strings" "strings"
"github.com/nektos/act/pkg/common" "github.com/actions-oss/act-cli/pkg/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
pkg/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"
"github.com/nektos/act/pkg/model" "github.com/actions-oss/act-cli/pkg/model"
"github.com/rhysd/actionlint" "github.com/rhysd/actionlint"
) )

2
pkg/exprparser/functions_test.go
View File

@@ -4,7 +4,7 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
"github.com/nektos/act/pkg/model" "github.com/actions-oss/act-cli/pkg/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )

2
pkg/exprparser/interpreter.go
View File

@@ -7,7 +7,7 @@ import (
"reflect" "reflect"
"strings" "strings"
"github.com/nektos/act/pkg/model" "github.com/actions-oss/act-cli/pkg/model"
"github.com/rhysd/actionlint" "github.com/rhysd/actionlint"
) )

2
pkg/exprparser/interpreter_test.go
View File

@@ -4,7 +4,7 @@ import (
"math" "math"
"testing" "testing"
"github.com/nektos/act/pkg/model" "github.com/actions-oss/act-cli/pkg/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )

2
pkg/model/action.go
View File

@@ -5,7 +5,7 @@ import (
"io" "io"
"strings" "strings"
"github.com/nektos/act/pkg/schema" "github.com/actions-oss/act-cli/pkg/schema"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
) )

4
pkg/model/github_context.go
View File

@@ -5,8 +5,8 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/nektos/act/pkg/common" "github.com/actions-oss/act-cli/pkg/common"
"github.com/nektos/act/pkg/common/git" "github.com/actions-oss/act-cli/pkg/common/git"
) )
type GithubContext struct { type GithubContext struct {

4
pkg/model/workflow.go
View File

@@ -8,8 +8,8 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/nektos/act/pkg/common" "github.com/actions-oss/act-cli/pkg/common"
"github.com/nektos/act/pkg/schema" "github.com/actions-oss/act-cli/pkg/schema"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
) )

6
pkg/runner/action.go
View File

@@ -16,9 +16,9 @@ import (
"github.com/kballard/go-shellquote" "github.com/kballard/go-shellquote"
"github.com/nektos/act/pkg/common" "github.com/actions-oss/act-cli/pkg/common"
"github.com/nektos/act/pkg/container" "github.com/actions-oss/act-cli/pkg/container"
"github.com/nektos/act/pkg/model" "github.com/actions-oss/act-cli/pkg/model"
) )
type actionStep interface { type actionStep interface {

2
pkg/runner/action_cache.go
View File

@@ -13,13 +13,13 @@ import (
"strings" "strings"
"time" "time"
"github.com/actions-oss/act-cli/pkg/common"
git "github.com/go-git/go-git/v5" git "github.com/go-git/go-git/v5"
config "github.com/go-git/go-git/v5/config" config "github.com/go-git/go-git/v5/config"
"github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/plumbing"
"github.com/go-git/go-git/v5/plumbing/object" "github.com/go-git/go-git/v5/plumbing/object"
"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"
"github.com/nektos/act/pkg/common"
) )
type ActionCache interface { type ActionCache interface {

2
pkg/runner/action_cache_offline_mode.go
View File

@@ -5,9 +5,9 @@ import (
"io" "io"
"path" "path"
"github.com/actions-oss/act-cli/pkg/common"
git "github.com/go-git/go-git/v5" git "github.com/go-git/go-git/v5"
"github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/plumbing"
"github.com/nektos/act/pkg/common"
) )
type GoGitActionCacheOfflineMode struct { type GoGitActionCacheOfflineMode struct {

4
pkg/runner/action_composite.go
View File

@@ -6,8 +6,8 @@ import (
"regexp" "regexp"
"strings" "strings"
"github.com/nektos/act/pkg/common" "github.com/actions-oss/act-cli/pkg/common"
"github.com/nektos/act/pkg/model" "github.com/actions-oss/act-cli/pkg/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
pkg/runner/action_test.go
View File

@@ -7,7 +7,7 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/nektos/act/pkg/model" "github.com/actions-oss/act-cli/pkg/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
) )

2
pkg/runner/command.go
View File

@@ -5,7 +5,7 @@ import (
"regexp" "regexp"
"strings" "strings"
"github.com/nektos/act/pkg/common" "github.com/actions-oss/act-cli/pkg/common"
) )
var commandPatternGA *regexp.Regexp var commandPatternGA *regexp.Regexp

4
pkg/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"
"github.com/nektos/act/pkg/common" "github.com/actions-oss/act-cli/pkg/common"
"github.com/nektos/act/pkg/model" "github.com/actions-oss/act-cli/pkg/model"
) )
func TestSetEnv(t *testing.T) { func TestSetEnv(t *testing.T) {

4
pkg/runner/container_mock_test.go
View File

@@ -4,8 +4,8 @@ import (
"context" "context"
"io" "io"
"github.com/nektos/act/pkg/common" "github.com/actions-oss/act-cli/pkg/common"
"github.com/nektos/act/pkg/container" "github.com/actions-oss/act-cli/pkg/container"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
) )

8
pkg/runner/expression.go
View File

@@ -12,10 +12,10 @@ import (
_ "embed" _ "embed"
"github.com/nektos/act/pkg/common" "github.com/actions-oss/act-cli/pkg/common"
"github.com/nektos/act/pkg/container" "github.com/actions-oss/act-cli/pkg/container"
"github.com/nektos/act/pkg/exprparser" "github.com/actions-oss/act-cli/pkg/exprparser"
"github.com/nektos/act/pkg/model" "github.com/actions-oss/act-cli/pkg/model"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
) )

4
pkg/runner/expression_test.go
View File

@@ -8,8 +8,8 @@ import (
"sort" "sort"
"testing" "testing"
"github.com/nektos/act/pkg/exprparser" "github.com/actions-oss/act-cli/pkg/exprparser"
"github.com/nektos/act/pkg/model" "github.com/actions-oss/act-cli/pkg/model"
assert "github.com/stretchr/testify/assert" assert "github.com/stretchr/testify/assert"
yaml "gopkg.in/yaml.v3" yaml "gopkg.in/yaml.v3"
) )

4
pkg/runner/job_executor.go
View File

@@ -5,8 +5,8 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/nektos/act/pkg/common" "github.com/actions-oss/act-cli/pkg/common"
"github.com/nektos/act/pkg/model" "github.com/actions-oss/act-cli/pkg/model"
) )
type jobInfo interface { type jobInfo interface {

6
pkg/runner/job_executor_test.go
View File

@@ -6,9 +6,9 @@ import (
"io" "io"
"testing" "testing"
"github.com/nektos/act/pkg/common" "github.com/actions-oss/act-cli/pkg/common"
"github.com/nektos/act/pkg/container" "github.com/actions-oss/act-cli/pkg/container"
"github.com/nektos/act/pkg/model" "github.com/actions-oss/act-cli/pkg/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
) )

4
pkg/runner/local_repository_cache.go
View File

@@ -12,8 +12,8 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/nektos/act/pkg/common" "github.com/actions-oss/act-cli/pkg/common"
"github.com/nektos/act/pkg/filecollector" "github.com/actions-oss/act-cli/pkg/filecollector"
) )
type LocalRepositoryCache struct { type LocalRepositoryCache struct {

2
pkg/runner/logger.go
View File

@@ -9,7 +9,7 @@ import (
"strings" "strings"
"sync" "sync"
"github.com/nektos/act/pkg/common" "github.com/actions-oss/act-cli/pkg/common"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"golang.org/x/term" "golang.org/x/term"

4
pkg/runner/reusable_workflow.go
View File

@@ -7,8 +7,8 @@ import (
"path" "path"
"regexp" "regexp"
"github.com/nektos/act/pkg/common" "github.com/actions-oss/act-cli/pkg/common"
"github.com/nektos/act/pkg/model" "github.com/actions-oss/act-cli/pkg/model"
) )
func newLocalReusableWorkflowExecutor(rc *RunContext) common.Executor { func newLocalReusableWorkflowExecutor(rc *RunContext) common.Executor {

8
pkg/runner/run_context.go
View File

@@ -20,11 +20,11 @@ import (
"strings" "strings"
"time" "time"
"github.com/actions-oss/act-cli/pkg/common"
"github.com/actions-oss/act-cli/pkg/container"
"github.com/actions-oss/act-cli/pkg/exprparser"
"github.com/actions-oss/act-cli/pkg/model"
"github.com/docker/go-connections/nat" "github.com/docker/go-connections/nat"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/container"
"github.com/nektos/act/pkg/exprparser"
"github.com/nektos/act/pkg/model"
"github.com/opencontainers/selinux/go-selinux" "github.com/opencontainers/selinux/go-selinux"
) )

4
pkg/runner/run_context_test.go
View File

@@ -10,9 +10,9 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/actions-oss/act-cli/pkg/exprparser"
"github.com/actions-oss/act-cli/pkg/model"
"github.com/golang-jwt/jwt/v5" "github.com/golang-jwt/jwt/v5"
"github.com/nektos/act/pkg/exprparser"
"github.com/nektos/act/pkg/model"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
assert "github.com/stretchr/testify/assert" assert "github.com/stretchr/testify/assert"

4
pkg/runner/runner.go
View File

@@ -7,9 +7,9 @@ import (
"os" "os"
"runtime" "runtime"
"github.com/actions-oss/act-cli/pkg/common"
"github.com/actions-oss/act-cli/pkg/model"
docker_container "github.com/docker/docker/api/types/container" docker_container "github.com/docker/docker/api/types/container"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/model"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
) )

4
pkg/runner/runner_test.go
View File

@@ -17,8 +17,8 @@ import (
assert "github.com/stretchr/testify/assert" assert "github.com/stretchr/testify/assert"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
"github.com/nektos/act/pkg/common" "github.com/actions-oss/act-cli/pkg/common"
"github.com/nektos/act/pkg/model" "github.com/actions-oss/act-cli/pkg/model"
) )
var ( var (

8
pkg/runner/step.go
View File

@@ -8,10 +8,10 @@ import (
"strings" "strings"
"time" "time"
"github.com/nektos/act/pkg/common" "github.com/actions-oss/act-cli/pkg/common"
"github.com/nektos/act/pkg/container" "github.com/actions-oss/act-cli/pkg/container"
"github.com/nektos/act/pkg/exprparser" "github.com/actions-oss/act-cli/pkg/exprparser"
"github.com/nektos/act/pkg/model" "github.com/actions-oss/act-cli/pkg/model"
) )
type step interface { type step interface {

4
pkg/runner/step_action_local.go
View File

@@ -11,8 +11,8 @@ import (
"path" "path"
"path/filepath" "path/filepath"
"github.com/nektos/act/pkg/common" "github.com/actions-oss/act-cli/pkg/common"
"github.com/nektos/act/pkg/model" "github.com/actions-oss/act-cli/pkg/model"
) )
type stepActionLocal struct { type stepActionLocal struct {

4
pkg/runner/step_action_local_test.go
View File

@@ -8,8 +8,8 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/nektos/act/pkg/common" "github.com/actions-oss/act-cli/pkg/common"
"github.com/nektos/act/pkg/model" "github.com/actions-oss/act-cli/pkg/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"

4
pkg/runner/step_action_remote.go
View File

@@ -11,8 +11,8 @@ import (
"regexp" "regexp"
"strings" "strings"
"github.com/nektos/act/pkg/common" "github.com/actions-oss/act-cli/pkg/common"
"github.com/nektos/act/pkg/model" "github.com/actions-oss/act-cli/pkg/model"
) )
type stepActionRemote struct { type stepActionRemote struct {

4
pkg/runner/step_action_remote_test.go
View File

@@ -12,8 +12,8 @@ import (
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
"github.com/nektos/act/pkg/common" "github.com/actions-oss/act-cli/pkg/common"
"github.com/nektos/act/pkg/model" "github.com/actions-oss/act-cli/pkg/model"
) )
type stepActionRemoteMocks struct { type stepActionRemoteMocks struct {

6
pkg/runner/step_docker.go
View File

@@ -5,10 +5,10 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/actions-oss/act-cli/pkg/common"
"github.com/actions-oss/act-cli/pkg/container"
"github.com/actions-oss/act-cli/pkg/model"
"github.com/kballard/go-shellquote" "github.com/kballard/go-shellquote"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/container"
"github.com/nektos/act/pkg/model"
) )
type stepDocker struct { type stepDocker struct {

4
pkg/runner/step_docker_test.go
View File

@@ -6,8 +6,8 @@ import (
"io" "io"
"testing" "testing"
"github.com/nektos/act/pkg/container" "github.com/actions-oss/act-cli/pkg/container"
"github.com/nektos/act/pkg/model" "github.com/actions-oss/act-cli/pkg/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
) )

2
pkg/runner/step_factory.go
View File

@@ -3,7 +3,7 @@ package runner
import ( import (
"fmt" "fmt"
"github.com/nektos/act/pkg/model" "github.com/actions-oss/act-cli/pkg/model"
) )
type stepFactory interface { type stepFactory interface {

2
pkg/runner/step_factory_test.go
View File

@@ -3,7 +3,7 @@ package runner
import ( import (
"testing" "testing"
"github.com/nektos/act/pkg/model" "github.com/actions-oss/act-cli/pkg/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )

8
pkg/runner/step_run.go
View File

@@ -8,10 +8,10 @@ import (
"github.com/kballard/go-shellquote" "github.com/kballard/go-shellquote"
"github.com/nektos/act/pkg/common" "github.com/actions-oss/act-cli/pkg/common"
"github.com/nektos/act/pkg/container" "github.com/actions-oss/act-cli/pkg/container"
"github.com/nektos/act/pkg/lookpath" "github.com/actions-oss/act-cli/pkg/lookpath"
"github.com/nektos/act/pkg/model" "github.com/actions-oss/act-cli/pkg/model"
) )
type stepRun struct { type stepRun struct {

4
pkg/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"
"github.com/nektos/act/pkg/container" "github.com/actions-oss/act-cli/pkg/container"
"github.com/nektos/act/pkg/model" "github.com/actions-oss/act-cli/pkg/model"
) )
func TestStepRun(t *testing.T) { func TestStepRun(t *testing.T) {

4
pkg/runner/step_test.go
View File

@@ -4,8 +4,8 @@ import (
"context" "context"
"testing" "testing"
"github.com/nektos/act/pkg/common" "github.com/actions-oss/act-cli/pkg/common"
"github.com/nektos/act/pkg/model" "github.com/actions-oss/act-cli/pkg/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"