From 70c9e21c85e9f8be905a88706eda74e30d00c0cb Mon Sep 17 00:00:00 2001 From: Steven Edwards Date: Mon, 27 Jan 2025 12:11:12 -0500 Subject: [PATCH] update go imports (#20) * 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. --- cmd/graph.go | 4 ++-- cmd/list.go | 2 +- cmd/root.go | 14 +++++++------- go.mod | 2 +- main.go | 2 +- pkg/artifactcache/handler.go | 2 +- pkg/artifacts/server.go | 2 +- pkg/artifacts/server_test.go | 4 ++-- pkg/common/git/git.go | 2 +- pkg/common/git/git_test.go | 14 +++++++------- pkg/container/container_types.go | 2 +- pkg/container/docker_auth.go | 2 +- pkg/container/docker_build.go | 2 +- pkg/container/docker_network.go | 2 +- pkg/container/docker_pull.go | 2 +- pkg/container/docker_run.go | 6 +++--- pkg/container/docker_stub.go | 2 +- pkg/container/docker_volume.go | 2 +- pkg/container/host_environment.go | 6 +++--- pkg/container/parse_env_file.go | 2 +- pkg/exprparser/functions.go | 2 +- pkg/exprparser/functions_test.go | 2 +- pkg/exprparser/interpreter.go | 2 +- pkg/exprparser/interpreter_test.go | 2 +- pkg/model/action.go | 2 +- pkg/model/github_context.go | 4 ++-- pkg/model/workflow.go | 4 ++-- pkg/runner/action.go | 6 +++--- pkg/runner/action_cache.go | 2 +- pkg/runner/action_cache_offline_mode.go | 2 +- pkg/runner/action_composite.go | 4 ++-- pkg/runner/action_test.go | 2 +- pkg/runner/command.go | 2 +- pkg/runner/command_test.go | 4 ++-- pkg/runner/container_mock_test.go | 4 ++-- pkg/runner/expression.go | 8 ++++---- pkg/runner/expression_test.go | 4 ++-- pkg/runner/job_executor.go | 4 ++-- pkg/runner/job_executor_test.go | 6 +++--- pkg/runner/local_repository_cache.go | 4 ++-- pkg/runner/logger.go | 2 +- pkg/runner/reusable_workflow.go | 4 ++-- pkg/runner/run_context.go | 8 ++++---- pkg/runner/run_context_test.go | 4 ++-- pkg/runner/runner.go | 4 ++-- pkg/runner/runner_test.go | 4 ++-- pkg/runner/step.go | 8 ++++---- pkg/runner/step_action_local.go | 4 ++-- pkg/runner/step_action_local_test.go | 4 ++-- pkg/runner/step_action_remote.go | 4 ++-- pkg/runner/step_action_remote_test.go | 4 ++-- pkg/runner/step_docker.go | 6 +++--- pkg/runner/step_docker_test.go | 4 ++-- pkg/runner/step_factory.go | 2 +- pkg/runner/step_factory_test.go | 2 +- pkg/runner/step_run.go | 8 ++++---- pkg/runner/step_run_test.go | 4 ++-- pkg/runner/step_test.go | 4 ++-- 58 files changed, 113 insertions(+), 113 deletions(-) diff --git a/cmd/graph.go b/cmd/graph.go index b38487b..c76ee1d 100644 --- a/cmd/graph.go +++ b/cmd/graph.go @@ -3,8 +3,8 @@ package cmd import ( "os" - "github.com/nektos/act/pkg/common" - "github.com/nektos/act/pkg/model" + "github.com/actions-oss/act-cli/pkg/common" + "github.com/actions-oss/act-cli/pkg/model" ) func drawGraph(plan *model.Plan) error { diff --git a/cmd/list.go b/cmd/list.go index 15799aa..b1f67bd 100644 --- a/cmd/list.go +++ b/cmd/list.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "github.com/nektos/act/pkg/model" + "github.com/actions-oss/act-cli/pkg/model" ) func printList(plan *model.Plan) error { diff --git a/cmd/root.go b/cmd/root.go index 9b74b08..33e31b5 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -23,12 +23,12 @@ import ( "github.com/spf13/cobra/doc" "gopkg.in/yaml.v3" - "github.com/nektos/act/pkg/artifactcache" - "github.com/nektos/act/pkg/artifacts" - "github.com/nektos/act/pkg/common" - "github.com/nektos/act/pkg/container" - "github.com/nektos/act/pkg/model" - "github.com/nektos/act/pkg/runner" + "github.com/actions-oss/act-cli/pkg/artifactcache" + "github.com/actions-oss/act-cli/pkg/artifacts" + "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/actions-oss/act-cli/pkg/runner" ) // Execute is the entry point to running the CLI @@ -663,7 +663,7 @@ func defaultImageSurvey(actrc string) error { var answer string 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)", - 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", Options: []string{"Large", "Medium", "Micro"}, } diff --git a/go.mod b/go.mod index adeb822..bac700e 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/nektos/act +module github.com/actions-oss/act-cli go 1.23 diff --git a/main.go b/main.go index 37b0fec..2368211 100644 --- a/main.go +++ b/main.go @@ -7,7 +7,7 @@ import ( "os/signal" "syscall" - "github.com/nektos/act/cmd" + "github.com/actions-oss/act-cli/cmd" ) //go:embed VERSION diff --git a/pkg/artifactcache/handler.go b/pkg/artifactcache/handler.go index cd0daaa..85a5277 100644 --- a/pkg/artifactcache/handler.go +++ b/pkg/artifactcache/handler.go @@ -20,7 +20,7 @@ import ( "github.com/timshannon/bolthold" "go.etcd.io/bbolt" - "github.com/nektos/act/pkg/common" + "github.com/actions-oss/act-cli/pkg/common" ) const ( diff --git a/pkg/artifacts/server.go b/pkg/artifacts/server.go index c3207f1..c98d811 100644 --- a/pkg/artifacts/server.go +++ b/pkg/artifacts/server.go @@ -15,7 +15,7 @@ import ( "github.com/julienschmidt/httprouter" - "github.com/nektos/act/pkg/common" + "github.com/actions-oss/act-cli/pkg/common" ) type FileContainerResourceURL struct { diff --git a/pkg/artifacts/server_test.go b/pkg/artifacts/server_test.go index 0e9dca1..7067c78 100644 --- a/pkg/artifacts/server_test.go +++ b/pkg/artifacts/server_test.go @@ -17,8 +17,8 @@ import ( log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" - "github.com/nektos/act/pkg/model" - "github.com/nektos/act/pkg/runner" + "github.com/actions-oss/act-cli/pkg/model" + "github.com/actions-oss/act-cli/pkg/runner" ) type writableMapFile struct { diff --git a/pkg/common/git/git.go b/pkg/common/git/git.go index 3c5af7b..d1a5a0e 100644 --- a/pkg/common/git/git.go +++ b/pkg/common/git/git.go @@ -19,7 +19,7 @@ import ( "github.com/mattn/go-isatty" log "github.com/sirupsen/logrus" - "github.com/nektos/act/pkg/common" + "github.com/actions-oss/act-cli/pkg/common" ) var ( diff --git a/pkg/common/git/git_test.go b/pkg/common/git/git_test.go index 37e04d4..9c7037f 100644 --- a/pkg/common/git/git_test.go +++ b/pkg/common/git/git_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/nektos/act/pkg/common" + "github.com/actions-oss/act-cli/pkg/common" ) 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"}, {"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:nektos/act", "GitHub", "nektos/act"}, - {"https://github.com/nektos/act.git", "GitHub", "nektos/act"}, - {"http://github.com/nektos/act.git", "GitHub", "nektos/act"}, - {"https://github.com/nektos/act", "GitHub", "nektos/act"}, - {"http://github.com/nektos/act", "GitHub", "nektos/act"}, + {"git@github.com:actions-oss/act-cli.git", "GitHub", "actions-oss/act-cli"}, + {"git@github.com:actions-oss/act-cli", "GitHub", "actions-oss/act-cli"}, + {"https://github.com/actions-oss/act-cli.git", "GitHub", "actions-oss/act-cli"}, + {"http://github.com/actions-oss/act-cli.git", "GitHub", "actions-oss/act-cli"}, + {"https://github.com/actions-oss/act-cli", "GitHub", "actions-oss/act-cli"}, + {"http://github.com/actions-oss/act-cli", "GitHub", "actions-oss/act-cli"}, {"git+ssh://git@github.com/owner/repo.git", "GitHub", "owner/repo"}, {"http://myotherrepo.com/act.git", "", "http://myotherrepo.com/act.git"}, } diff --git a/pkg/container/container_types.go b/pkg/container/container_types.go index 627e5d8..ed5fac3 100644 --- a/pkg/container/container_types.go +++ b/pkg/container/container_types.go @@ -4,8 +4,8 @@ import ( "context" "io" + "github.com/actions-oss/act-cli/pkg/common" "github.com/docker/go-connections/nat" - "github.com/nektos/act/pkg/common" ) // NewContainerInput the input for the New function diff --git a/pkg/container/docker_auth.go b/pkg/container/docker_auth.go index e8dfb7d..256332b 100644 --- a/pkg/container/docker_auth.go +++ b/pkg/container/docker_auth.go @@ -6,10 +6,10 @@ import ( "context" "strings" + "github.com/actions-oss/act-cli/pkg/common" "github.com/docker/cli/cli/config" "github.com/docker/cli/cli/config/credentials" "github.com/docker/docker/api/types/registry" - "github.com/nektos/act/pkg/common" ) func LoadDockerAuthConfig(ctx context.Context, image string) (registry.AuthConfig, error) { diff --git a/pkg/container/docker_build.go b/pkg/container/docker_build.go index 825a095..1761b2f 100644 --- a/pkg/container/docker_build.go +++ b/pkg/container/docker_build.go @@ -16,7 +16,7 @@ import ( "github.com/moby/patternmatcher" "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 diff --git a/pkg/container/docker_network.go b/pkg/container/docker_network.go index 2ae0f61..c0f6610 100644 --- a/pkg/container/docker_network.go +++ b/pkg/container/docker_network.go @@ -5,8 +5,8 @@ package container import ( "context" + "github.com/actions-oss/act-cli/pkg/common" "github.com/docker/docker/api/types/network" - "github.com/nektos/act/pkg/common" ) func NewDockerNetworkCreateExecutor(name string) common.Executor { diff --git a/pkg/container/docker_pull.go b/pkg/container/docker_pull.go index 65b930e..03e9a1c 100644 --- a/pkg/container/docker_pull.go +++ b/pkg/container/docker_pull.go @@ -13,7 +13,7 @@ import ( "github.com/docker/docker/api/types/image" "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 diff --git a/pkg/container/docker_run.go b/pkg/container/docker_run.go index 0ce1cb9..a446dc3 100644 --- a/pkg/container/docker_run.go +++ b/pkg/container/docker_run.go @@ -35,8 +35,8 @@ import ( "github.com/spf13/pflag" "golang.org/x/term" - "github.com/nektos/act/pkg/common" - "github.com/nektos/act/pkg/filecollector" + "github.com/actions-oss/act-cli/pkg/common" + "github.com/actions-oss/act-cli/pkg/filecollector" ) // 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: return nil 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: return fmt.Errorf("exitcode '%d': failure", inspectResp.ExitCode) } diff --git a/pkg/container/docker_stub.go b/pkg/container/docker_stub.go index 3092c5c..929448c 100644 --- a/pkg/container/docker_stub.go +++ b/pkg/container/docker_stub.go @@ -7,7 +7,7 @@ import ( "runtime" "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" ) diff --git a/pkg/container/docker_volume.go b/pkg/container/docker_volume.go index f99c584..7f54055 100644 --- a/pkg/container/docker_volume.go +++ b/pkg/container/docker_volume.go @@ -5,9 +5,9 @@ package container import ( "context" + "github.com/actions-oss/act-cli/pkg/common" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/volume" - "github.com/nektos/act/pkg/common" ) func NewDockerVolumeRemoveExecutor(volumeName string, force bool) common.Executor { diff --git a/pkg/container/host_environment.go b/pkg/container/host_environment.go index cccb1cc..239c20b 100644 --- a/pkg/container/host_environment.go +++ b/pkg/container/host_environment.go @@ -20,9 +20,9 @@ import ( "github.com/go-git/go-git/v5/plumbing/format/gitignore" "golang.org/x/term" - "github.com/nektos/act/pkg/common" - "github.com/nektos/act/pkg/filecollector" - "github.com/nektos/act/pkg/lookpath" + "github.com/actions-oss/act-cli/pkg/common" + "github.com/actions-oss/act-cli/pkg/filecollector" + "github.com/actions-oss/act-cli/pkg/lookpath" ) type HostEnvironment struct { diff --git a/pkg/container/parse_env_file.go b/pkg/container/parse_env_file.go index ee79b7e..bd22bd9 100644 --- a/pkg/container/parse_env_file.go +++ b/pkg/container/parse_env_file.go @@ -8,7 +8,7 @@ import ( "io" "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 { diff --git a/pkg/exprparser/functions.go b/pkg/exprparser/functions.go index 83b2a08..018fc09 100644 --- a/pkg/exprparser/functions.go +++ b/pkg/exprparser/functions.go @@ -15,7 +15,7 @@ import ( "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" ) diff --git a/pkg/exprparser/functions_test.go b/pkg/exprparser/functions_test.go index ea51a2b..69f868b 100644 --- a/pkg/exprparser/functions_test.go +++ b/pkg/exprparser/functions_test.go @@ -4,7 +4,7 @@ import ( "path/filepath" "testing" - "github.com/nektos/act/pkg/model" + "github.com/actions-oss/act-cli/pkg/model" "github.com/stretchr/testify/assert" ) diff --git a/pkg/exprparser/interpreter.go b/pkg/exprparser/interpreter.go index 7630854..bc0a846 100644 --- a/pkg/exprparser/interpreter.go +++ b/pkg/exprparser/interpreter.go @@ -7,7 +7,7 @@ import ( "reflect" "strings" - "github.com/nektos/act/pkg/model" + "github.com/actions-oss/act-cli/pkg/model" "github.com/rhysd/actionlint" ) diff --git a/pkg/exprparser/interpreter_test.go b/pkg/exprparser/interpreter_test.go index f45851d..37419bc 100644 --- a/pkg/exprparser/interpreter_test.go +++ b/pkg/exprparser/interpreter_test.go @@ -4,7 +4,7 @@ import ( "math" "testing" - "github.com/nektos/act/pkg/model" + "github.com/actions-oss/act-cli/pkg/model" "github.com/stretchr/testify/assert" ) diff --git a/pkg/model/action.go b/pkg/model/action.go index 61b78a1..ee93743 100644 --- a/pkg/model/action.go +++ b/pkg/model/action.go @@ -5,7 +5,7 @@ import ( "io" "strings" - "github.com/nektos/act/pkg/schema" + "github.com/actions-oss/act-cli/pkg/schema" "gopkg.in/yaml.v3" ) diff --git a/pkg/model/github_context.go b/pkg/model/github_context.go index 4190d67..b64dbaa 100644 --- a/pkg/model/github_context.go +++ b/pkg/model/github_context.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/nektos/act/pkg/common" - "github.com/nektos/act/pkg/common/git" + "github.com/actions-oss/act-cli/pkg/common" + "github.com/actions-oss/act-cli/pkg/common/git" ) type GithubContext struct { diff --git a/pkg/model/workflow.go b/pkg/model/workflow.go index d67ce41..d8e08a2 100644 --- a/pkg/model/workflow.go +++ b/pkg/model/workflow.go @@ -8,8 +8,8 @@ import ( "strconv" "strings" - "github.com/nektos/act/pkg/common" - "github.com/nektos/act/pkg/schema" + "github.com/actions-oss/act-cli/pkg/common" + "github.com/actions-oss/act-cli/pkg/schema" log "github.com/sirupsen/logrus" "gopkg.in/yaml.v3" ) diff --git a/pkg/runner/action.go b/pkg/runner/action.go index 9a97519..fa2707e 100644 --- a/pkg/runner/action.go +++ b/pkg/runner/action.go @@ -16,9 +16,9 @@ import ( "github.com/kballard/go-shellquote" - "github.com/nektos/act/pkg/common" - "github.com/nektos/act/pkg/container" - "github.com/nektos/act/pkg/model" + "github.com/actions-oss/act-cli/pkg/common" + "github.com/actions-oss/act-cli/pkg/container" + "github.com/actions-oss/act-cli/pkg/model" ) type actionStep interface { diff --git a/pkg/runner/action_cache.go b/pkg/runner/action_cache.go index 471ed9e..46ce281 100644 --- a/pkg/runner/action_cache.go +++ b/pkg/runner/action_cache.go @@ -13,13 +13,13 @@ import ( "strings" "time" + "github.com/actions-oss/act-cli/pkg/common" git "github.com/go-git/go-git/v5" 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/object" "github.com/go-git/go-git/v5/plumbing/transport" "github.com/go-git/go-git/v5/plumbing/transport/http" - "github.com/nektos/act/pkg/common" ) type ActionCache interface { diff --git a/pkg/runner/action_cache_offline_mode.go b/pkg/runner/action_cache_offline_mode.go index a6926af..48bb721 100644 --- a/pkg/runner/action_cache_offline_mode.go +++ b/pkg/runner/action_cache_offline_mode.go @@ -5,9 +5,9 @@ import ( "io" "path" + "github.com/actions-oss/act-cli/pkg/common" git "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing" - "github.com/nektos/act/pkg/common" ) type GoGitActionCacheOfflineMode struct { diff --git a/pkg/runner/action_composite.go b/pkg/runner/action_composite.go index fee7e32..bdd87cc 100644 --- a/pkg/runner/action_composite.go +++ b/pkg/runner/action_composite.go @@ -6,8 +6,8 @@ import ( "regexp" "strings" - "github.com/nektos/act/pkg/common" - "github.com/nektos/act/pkg/model" + "github.com/actions-oss/act-cli/pkg/common" + "github.com/actions-oss/act-cli/pkg/model" ) func evaluateCompositeInputAndEnv(ctx context.Context, parent *RunContext, step actionStep) map[string]string { diff --git a/pkg/runner/action_test.go b/pkg/runner/action_test.go index 3286fac..59f4c3e 100644 --- a/pkg/runner/action_test.go +++ b/pkg/runner/action_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/nektos/act/pkg/model" + "github.com/actions-oss/act-cli/pkg/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/pkg/runner/command.go b/pkg/runner/command.go index d79ac03..d44f36d 100644 --- a/pkg/runner/command.go +++ b/pkg/runner/command.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - "github.com/nektos/act/pkg/common" + "github.com/actions-oss/act-cli/pkg/common" ) var commandPatternGA *regexp.Regexp diff --git a/pkg/runner/command_test.go b/pkg/runner/command_test.go index 57c7de5..3d0f3fd 100644 --- a/pkg/runner/command_test.go +++ b/pkg/runner/command_test.go @@ -10,8 +10,8 @@ import ( "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" - "github.com/nektos/act/pkg/common" - "github.com/nektos/act/pkg/model" + "github.com/actions-oss/act-cli/pkg/common" + "github.com/actions-oss/act-cli/pkg/model" ) func TestSetEnv(t *testing.T) { diff --git a/pkg/runner/container_mock_test.go b/pkg/runner/container_mock_test.go index 86343d5..7aedae1 100644 --- a/pkg/runner/container_mock_test.go +++ b/pkg/runner/container_mock_test.go @@ -4,8 +4,8 @@ import ( "context" "io" - "github.com/nektos/act/pkg/common" - "github.com/nektos/act/pkg/container" + "github.com/actions-oss/act-cli/pkg/common" + "github.com/actions-oss/act-cli/pkg/container" "github.com/stretchr/testify/mock" ) diff --git a/pkg/runner/expression.go b/pkg/runner/expression.go index b83d2f2..24f81ad 100644 --- a/pkg/runner/expression.go +++ b/pkg/runner/expression.go @@ -12,10 +12,10 @@ import ( _ "embed" - "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/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" "gopkg.in/yaml.v3" ) diff --git a/pkg/runner/expression_test.go b/pkg/runner/expression_test.go index 383539d..c0776e1 100644 --- a/pkg/runner/expression_test.go +++ b/pkg/runner/expression_test.go @@ -8,8 +8,8 @@ import ( "sort" "testing" - "github.com/nektos/act/pkg/exprparser" - "github.com/nektos/act/pkg/model" + "github.com/actions-oss/act-cli/pkg/exprparser" + "github.com/actions-oss/act-cli/pkg/model" assert "github.com/stretchr/testify/assert" yaml "gopkg.in/yaml.v3" ) diff --git a/pkg/runner/job_executor.go b/pkg/runner/job_executor.go index 30cd75c..8997697 100644 --- a/pkg/runner/job_executor.go +++ b/pkg/runner/job_executor.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/nektos/act/pkg/common" - "github.com/nektos/act/pkg/model" + "github.com/actions-oss/act-cli/pkg/common" + "github.com/actions-oss/act-cli/pkg/model" ) type jobInfo interface { diff --git a/pkg/runner/job_executor_test.go b/pkg/runner/job_executor_test.go index 6893d9d..27adcc6 100644 --- a/pkg/runner/job_executor_test.go +++ b/pkg/runner/job_executor_test.go @@ -6,9 +6,9 @@ import ( "io" "testing" - "github.com/nektos/act/pkg/common" - "github.com/nektos/act/pkg/container" - "github.com/nektos/act/pkg/model" + "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/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/pkg/runner/local_repository_cache.go b/pkg/runner/local_repository_cache.go index 1065b65..7f7f44e 100644 --- a/pkg/runner/local_repository_cache.go +++ b/pkg/runner/local_repository_cache.go @@ -12,8 +12,8 @@ import ( "path/filepath" "strings" - "github.com/nektos/act/pkg/common" - "github.com/nektos/act/pkg/filecollector" + "github.com/actions-oss/act-cli/pkg/common" + "github.com/actions-oss/act-cli/pkg/filecollector" ) type LocalRepositoryCache struct { diff --git a/pkg/runner/logger.go b/pkg/runner/logger.go index a788f68..fac030b 100644 --- a/pkg/runner/logger.go +++ b/pkg/runner/logger.go @@ -9,7 +9,7 @@ import ( "strings" "sync" - "github.com/nektos/act/pkg/common" + "github.com/actions-oss/act-cli/pkg/common" "github.com/sirupsen/logrus" "golang.org/x/term" diff --git a/pkg/runner/reusable_workflow.go b/pkg/runner/reusable_workflow.go index d8b183c..0958b35 100644 --- a/pkg/runner/reusable_workflow.go +++ b/pkg/runner/reusable_workflow.go @@ -7,8 +7,8 @@ import ( "path" "regexp" - "github.com/nektos/act/pkg/common" - "github.com/nektos/act/pkg/model" + "github.com/actions-oss/act-cli/pkg/common" + "github.com/actions-oss/act-cli/pkg/model" ) func newLocalReusableWorkflowExecutor(rc *RunContext) common.Executor { diff --git a/pkg/runner/run_context.go b/pkg/runner/run_context.go index a124da0..26c2abc 100644 --- a/pkg/runner/run_context.go +++ b/pkg/runner/run_context.go @@ -20,11 +20,11 @@ import ( "strings" "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/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" ) diff --git a/pkg/runner/run_context_test.go b/pkg/runner/run_context_test.go index de725b0..f5609ff 100644 --- a/pkg/runner/run_context_test.go +++ b/pkg/runner/run_context_test.go @@ -10,9 +10,9 @@ import ( "strings" "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/nektos/act/pkg/exprparser" - "github.com/nektos/act/pkg/model" log "github.com/sirupsen/logrus" assert "github.com/stretchr/testify/assert" diff --git a/pkg/runner/runner.go b/pkg/runner/runner.go index 59b92a5..2cfeee8 100644 --- a/pkg/runner/runner.go +++ b/pkg/runner/runner.go @@ -7,9 +7,9 @@ import ( "os" "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" - "github.com/nektos/act/pkg/common" - "github.com/nektos/act/pkg/model" log "github.com/sirupsen/logrus" ) diff --git a/pkg/runner/runner_test.go b/pkg/runner/runner_test.go index 8936812..057bd80 100644 --- a/pkg/runner/runner_test.go +++ b/pkg/runner/runner_test.go @@ -17,8 +17,8 @@ import ( assert "github.com/stretchr/testify/assert" "gopkg.in/yaml.v3" - "github.com/nektos/act/pkg/common" - "github.com/nektos/act/pkg/model" + "github.com/actions-oss/act-cli/pkg/common" + "github.com/actions-oss/act-cli/pkg/model" ) var ( diff --git a/pkg/runner/step.go b/pkg/runner/step.go index 7b761ba..5ae4446 100644 --- a/pkg/runner/step.go +++ b/pkg/runner/step.go @@ -8,10 +8,10 @@ import ( "strings" "time" - "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/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" ) type step interface { diff --git a/pkg/runner/step_action_local.go b/pkg/runner/step_action_local.go index 4bb85bf..e8bf18f 100644 --- a/pkg/runner/step_action_local.go +++ b/pkg/runner/step_action_local.go @@ -11,8 +11,8 @@ import ( "path" "path/filepath" - "github.com/nektos/act/pkg/common" - "github.com/nektos/act/pkg/model" + "github.com/actions-oss/act-cli/pkg/common" + "github.com/actions-oss/act-cli/pkg/model" ) type stepActionLocal struct { diff --git a/pkg/runner/step_action_local_test.go b/pkg/runner/step_action_local_test.go index c7b2625..c29ec66 100644 --- a/pkg/runner/step_action_local_test.go +++ b/pkg/runner/step_action_local_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "github.com/nektos/act/pkg/common" - "github.com/nektos/act/pkg/model" + "github.com/actions-oss/act-cli/pkg/common" + "github.com/actions-oss/act-cli/pkg/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "gopkg.in/yaml.v3" diff --git a/pkg/runner/step_action_remote.go b/pkg/runner/step_action_remote.go index 8b0ed0a..c2c9dfe 100644 --- a/pkg/runner/step_action_remote.go +++ b/pkg/runner/step_action_remote.go @@ -11,8 +11,8 @@ import ( "regexp" "strings" - "github.com/nektos/act/pkg/common" - "github.com/nektos/act/pkg/model" + "github.com/actions-oss/act-cli/pkg/common" + "github.com/actions-oss/act-cli/pkg/model" ) type stepActionRemote struct { diff --git a/pkg/runner/step_action_remote_test.go b/pkg/runner/step_action_remote_test.go index 848f254..c81f8bc 100644 --- a/pkg/runner/step_action_remote_test.go +++ b/pkg/runner/step_action_remote_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/mock" "gopkg.in/yaml.v3" - "github.com/nektos/act/pkg/common" - "github.com/nektos/act/pkg/model" + "github.com/actions-oss/act-cli/pkg/common" + "github.com/actions-oss/act-cli/pkg/model" ) type stepActionRemoteMocks struct { diff --git a/pkg/runner/step_docker.go b/pkg/runner/step_docker.go index cc28a3b..0c927e5 100644 --- a/pkg/runner/step_docker.go +++ b/pkg/runner/step_docker.go @@ -5,10 +5,10 @@ import ( "fmt" "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/nektos/act/pkg/common" - "github.com/nektos/act/pkg/container" - "github.com/nektos/act/pkg/model" ) type stepDocker struct { diff --git a/pkg/runner/step_docker_test.go b/pkg/runner/step_docker_test.go index 8753af5..6246f7f 100644 --- a/pkg/runner/step_docker_test.go +++ b/pkg/runner/step_docker_test.go @@ -6,8 +6,8 @@ import ( "io" "testing" - "github.com/nektos/act/pkg/container" - "github.com/nektos/act/pkg/model" + "github.com/actions-oss/act-cli/pkg/container" + "github.com/actions-oss/act-cli/pkg/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/pkg/runner/step_factory.go b/pkg/runner/step_factory.go index 4ac7eaf..110c06c 100644 --- a/pkg/runner/step_factory.go +++ b/pkg/runner/step_factory.go @@ -3,7 +3,7 @@ package runner import ( "fmt" - "github.com/nektos/act/pkg/model" + "github.com/actions-oss/act-cli/pkg/model" ) type stepFactory interface { diff --git a/pkg/runner/step_factory_test.go b/pkg/runner/step_factory_test.go index c981ef5..7e16ed9 100644 --- a/pkg/runner/step_factory_test.go +++ b/pkg/runner/step_factory_test.go @@ -3,7 +3,7 @@ package runner import ( "testing" - "github.com/nektos/act/pkg/model" + "github.com/actions-oss/act-cli/pkg/model" "github.com/stretchr/testify/assert" ) diff --git a/pkg/runner/step_run.go b/pkg/runner/step_run.go index aa5b2a6..bce9ad9 100644 --- a/pkg/runner/step_run.go +++ b/pkg/runner/step_run.go @@ -8,10 +8,10 @@ import ( "github.com/kballard/go-shellquote" - "github.com/nektos/act/pkg/common" - "github.com/nektos/act/pkg/container" - "github.com/nektos/act/pkg/lookpath" - "github.com/nektos/act/pkg/model" + "github.com/actions-oss/act-cli/pkg/common" + "github.com/actions-oss/act-cli/pkg/container" + "github.com/actions-oss/act-cli/pkg/lookpath" + "github.com/actions-oss/act-cli/pkg/model" ) type stepRun struct { diff --git a/pkg/runner/step_run_test.go b/pkg/runner/step_run_test.go index 151c7ab..157adee 100644 --- a/pkg/runner/step_run_test.go +++ b/pkg/runner/step_run_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/nektos/act/pkg/container" - "github.com/nektos/act/pkg/model" + "github.com/actions-oss/act-cli/pkg/container" + "github.com/actions-oss/act-cli/pkg/model" ) func TestStepRun(t *testing.T) { diff --git a/pkg/runner/step_test.go b/pkg/runner/step_test.go index b36ad9e..2b97a89 100644 --- a/pkg/runner/step_test.go +++ b/pkg/runner/step_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/nektos/act/pkg/common" - "github.com/nektos/act/pkg/model" + "github.com/actions-oss/act-cli/pkg/common" + "github.com/actions-oss/act-cli/pkg/model" log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock"