From 34139191617a0b0c51df5979ae391fefac253097 Mon Sep 17 00:00:00 2001 From: Christopher Homberger Date: Sun, 22 Feb 2026 20:54:58 +0100 Subject: [PATCH] update import path --- cmd/graph.go | 4 +- cmd/list.go | 2 +- cmd/root.go | 16 +++---- go.mod | 60 +++++++++++++++---------- go.sum | 37 +++++++++++++++ internal/app/act-cli/VERSION | 1 + internal/app/act-cli/main.go | 19 ++++++++ internal/app/cmd/cache-server.go | 2 +- internal/app/cmd/exec.go | 12 ++--- internal/app/run/runner.go | 8 ++-- internal/app/run/workflow.go | 4 +- internal/app/run/workflow_test.go | 2 +- internal/eval/v2/evaluator.go | 2 +- internal/eval/v2/functions.go | 4 +- internal/model/token_utils.go | 2 +- internal/model/workflow_state_test.go | 6 +-- internal/templateeval/evaluate.go | 6 +-- internal/templateeval/evaluate_test.go | 4 +- 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 | 2 +- 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 | 4 +- 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/interpreter.go | 6 +-- 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_darwin.go | 6 +-- pkg/runner/run_context_other.go | 2 +- 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 +- pkg/schema/schema.go | 2 +- pkg/tart/environment_darwin.go | 4 +- pkg/tart/vm_darwin.go | 2 +- 75 files changed, 233 insertions(+), 164 deletions(-) create mode 100644 internal/app/act-cli/VERSION create mode 100644 internal/app/act-cli/main.go diff --git a/cmd/graph.go b/cmd/graph.go index c76ee1d6..35620856 100644 --- a/cmd/graph.go +++ b/cmd/graph.go @@ -3,8 +3,8 @@ package cmd import ( "os" - "github.com/actions-oss/act-cli/pkg/common" - "github.com/actions-oss/act-cli/pkg/model" + "gitea.com/gitea/act_runner/pkg/common" + "gitea.com/gitea/act_runner/pkg/model" ) func drawGraph(plan *model.Plan) error { diff --git a/cmd/list.go b/cmd/list.go index b1f67bd1..260a05da 100644 --- a/cmd/list.go +++ b/cmd/list.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "github.com/actions-oss/act-cli/pkg/model" + "gitea.com/gitea/act_runner/pkg/model" ) func printList(plan *model.Plan) error { diff --git a/cmd/root.go b/cmd/root.go index 320ae9b6..7e27a6a6 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -25,14 +25,14 @@ import ( "github.com/spf13/pflag" "gopkg.in/yaml.v3" - "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/gh" - "github.com/actions-oss/act-cli/pkg/model" - "github.com/actions-oss/act-cli/pkg/runner" - "github.com/actions-oss/act-cli/pkg/schema" + "gitea.com/gitea/act_runner/pkg/artifactcache" + "gitea.com/gitea/act_runner/pkg/artifacts" + "gitea.com/gitea/act_runner/pkg/common" + "gitea.com/gitea/act_runner/pkg/container" + "gitea.com/gitea/act_runner/pkg/gh" + "gitea.com/gitea/act_runner/pkg/model" + "gitea.com/gitea/act_runner/pkg/runner" + "gitea.com/gitea/act_runner/pkg/schema" ) type Flag struct { diff --git a/go.mod b/go.mod index 7281965a..7ee2bd36 100644 --- a/go.mod +++ b/go.mod @@ -21,71 +21,83 @@ require ( gotest.tools/v3 v3.5.2 ) -require go.yaml.in/yaml/v4 v4.0.0-rc.3 +require ( + dario.cat/mergo v1.0.2 + github.com/AlecAivazis/survey/v2 v2.3.7 + github.com/Masterminds/semver v1.5.0 + github.com/adrg/xdg v0.5.3 + github.com/andreaskoch/go-fswatch v1.0.0 + github.com/avast/retry-go v3.0.0+incompatible + github.com/containerd/errdefs v1.0.0 + github.com/creack/pty v1.1.24 + github.com/distribution/reference v0.6.0 + github.com/docker/cli v28.5.1+incompatible + github.com/docker/go-connections v0.6.0 + github.com/go-git/go-billy/v5 v5.7.0 + github.com/go-git/go-git/v5 v5.16.5 + github.com/golang-jwt/jwt/v5 v5.3.0 + github.com/julienschmidt/httprouter v1.3.0 + github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 + github.com/moby/go-archive v0.1.0 + github.com/moby/patternmatcher v0.6.0 + github.com/opencontainers/image-spec v1.1.1 + github.com/opencontainers/selinux v1.13.1 + github.com/pkg/errors v0.9.1 + github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 + github.com/spf13/pflag v1.0.10 + github.com/timshannon/bolthold v0.0.0-20240314194003-30aac6950928 + go.etcd.io/bbolt v1.4.3 + go.yaml.in/yaml/v4 v4.0.0-rc.3 + golang.org/x/crypto v0.48.0 + golang.org/x/sync v0.19.0 +) require ( cyphar.com/go-pathrs v0.2.3 // indirect - dario.cat/mergo v1.0.2 // indirect - github.com/Masterminds/semver v1.5.0 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect github.com/ProtonMail/go-crypto v1.3.0 // indirect - github.com/avast/retry-go v3.0.0+incompatible // indirect github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/cloudflare/circl v1.6.3 // indirect - github.com/containerd/errdefs v1.0.0 // indirect github.com/containerd/errdefs/pkg v0.3.0 // indirect github.com/containerd/log v0.1.0 // indirect - github.com/creack/pty v1.1.24 // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect github.com/cyphar/filepath-securejoin v0.6.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/distribution/reference v0.6.0 // indirect - github.com/docker/cli v28.5.1+incompatible // indirect github.com/docker/docker-credential-helpers v0.9.5 // indirect - github.com/docker/go-connections v0.6.0 // indirect github.com/docker/go-units v0.5.0 // indirect github.com/emirpasic/gods v1.18.1 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect - github.com/go-git/go-billy/v5 v5.7.0 // indirect - github.com/go-git/go-git/v5 v5.16.5 // indirect github.com/go-logr/logr v1.4.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.4.0 // indirect - github.com/golang-jwt/jwt/v5 v5.3.0 // indirect github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect github.com/google/go-cmp v0.7.0 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect - github.com/julienschmidt/httprouter v1.3.0 // indirect - github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect github.com/kevinburke/ssh_config v1.6.0 // indirect github.com/klauspost/compress v1.18.4 // indirect github.com/klauspost/cpuid/v2 v2.3.0 // indirect + github.com/mattn/go-colorable v0.1.14 // indirect + github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect github.com/moby/docker-image-spec v1.3.1 // indirect - github.com/moby/go-archive v0.1.0 // indirect - github.com/moby/patternmatcher v0.6.0 // indirect github.com/moby/sys/sequential v0.6.0 // indirect github.com/moby/sys/user v0.4.0 // indirect github.com/moby/sys/userns v0.1.0 // indirect github.com/moby/term v0.5.2 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect - github.com/opencontainers/image-spec v1.1.1 // indirect - github.com/opencontainers/selinux v1.13.1 // indirect github.com/pjbgf/sha1cd v0.5.0 // indirect - github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/sergi/go-diff v1.4.0 // indirect github.com/skeema/knownhosts v1.3.2 // indirect - github.com/spf13/pflag v1.0.10 // indirect github.com/stretchr/objx v0.5.3 // indirect - github.com/timshannon/bolthold v0.0.0-20240314194003-30aac6950928 // indirect github.com/xanzy/ssh-agent v0.3.3 // indirect github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect - go.etcd.io/bbolt v1.4.3 // indirect go.opentelemetry.io/auto/sdk v1.2.1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0 // indirect go.opentelemetry.io/otel v1.40.0 // indirect @@ -93,10 +105,10 @@ require ( go.opentelemetry.io/otel/metric v1.40.0 // indirect go.opentelemetry.io/otel/trace v1.40.0 // indirect go.opentelemetry.io/proto/otlp v1.0.0 // indirect - golang.org/x/crypto v0.48.0 // indirect + go.yaml.in/yaml/v3 v3.0.4 // indirect golang.org/x/net v0.50.0 // indirect - golang.org/x/sync v0.19.0 // indirect golang.org/x/sys v0.41.0 // indirect + golang.org/x/text v0.34.0 // indirect golang.org/x/tools v0.42.0 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect ) diff --git a/go.sum b/go.sum index 7bfe9d16..b5db33e6 100644 --- a/go.sum +++ b/go.sum @@ -12,6 +12,8 @@ gitea.com/actions-oss/act-cli v0.4.2-0.20260220200604-40ee0f3ef6fc h1:KXg17X1FZh gitea.com/actions-oss/act-cli v0.4.2-0.20260220200604-40ee0f3ef6fc/go.mod h1:tl2dPJQRui7za899nfJIhPqP3a8ii+ySEvzL18mjC0U= github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 h1:He8afgbRMd7mFxO99hRNu+6tazq8nFF9lIwo9JFroBk= github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8= +github.com/AlecAivazis/survey/v2 v2.3.7 h1:6I/u8FvytdGsgonrYsVn2t8t4QiRnh6QSTqkkhIiSjQ= +github.com/AlecAivazis/survey/v2 v2.3.7/go.mod h1:xUTIdE4KCOIjsBAE1JYsUPoCqYdZ1reCfTwbto0Fduo= github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c h1:udKWzYgxTojEKWjV8V+WSxDXJ4NFATAsZjh8iIbsQIg= github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= @@ -19,8 +21,13 @@ github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF0 github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= +github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2/go.mod h1:HBCaDeC1lPdgDeDbhX8XFpy1jqjK0IBG8W5K+xYqA0w= github.com/ProtonMail/go-crypto v1.3.0 h1:ILq8+Sf5If5DCpHQp4PbZdS1J7HDFRXz/+xKBiRGFrw= github.com/ProtonMail/go-crypto v1.3.0/go.mod h1:9whxjD8Rbs29b4XWbB8irEcE8KHMqaR2e7GWU1R+/PE= +github.com/adrg/xdg v0.5.3 h1:xRnxJXne7+oWDatRhR1JLnvuccuIeCoBu2rtuLqQB78= +github.com/adrg/xdg v0.5.3/go.mod h1:nlTsY+NNiCBGCK2tpm09vRqfVzrc2fLmXGpBLF0zlTQ= +github.com/andreaskoch/go-fswatch v1.0.0 h1:la8nP/HiaFCxP2IM6NZNUCoxgLWuyNFgH0RligBbnJU= +github.com/andreaskoch/go-fswatch v1.0.0/go.mod h1:r5/iV+4jfwoY2sYqBkg8vpF04ehOvEl4qPptVGdxmqo= github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8= github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= @@ -41,7 +48,9 @@ github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151X github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk= github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= +github.com/cpuguy83/go-md2man/v2 v2.0.6 h1:XJtiaUW6dEEqVuZiMTn1ldk455QWwEIsMIJlo5vtkx0= github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= +github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s= github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE= github.com/cyphar/filepath-securejoin v0.6.1 h1:5CeZ1jPXEiYt3+Z6zqprSAgSWiggmpVyciv8syjIpVE= @@ -96,6 +105,7 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg= +github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec/go.mod h1:Q48J4R4DvxnHolD5P8pOtXigYlRuPLGl6moFx3ulM68= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= @@ -119,8 +129,15 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE= +github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= +github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQE9x6ikvDFZS2mDVS3drnohI= +github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0= github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo= github.com/moby/go-archive v0.1.0 h1:Kk/5rdW/g+H8NHdJW2gsXyZ7UnzvJNOy6VKJqueWdcQ= @@ -155,7 +172,11 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= +github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww= +github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI= +github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs= github.com/sergi/go-diff v1.4.0 h1:n/SP9D5ad1fORl+llWyN+D6qoUETXNZARKjyY2/KVCw= github.com/sergi/go-diff v1.4.0/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= @@ -176,6 +197,7 @@ github.com/stretchr/objx v0.5.3/go.mod h1:rDQraq+vQZU7Fde9LOZLr8Tax6zZvy4kuNKF+Q github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= @@ -193,6 +215,7 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1: github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74= github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.etcd.io/bbolt v1.3.8/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= go.etcd.io/bbolt v1.4.3 h1:dEadXpI6G79deX5prL3QRNP6JB8UxVkqo4UPnHaNXJo= go.etcd.io/bbolt v1.4.3/go.mod h1:tKQlpPaYCVFctUIgFKFnAlvbmB3tpy1vkTnDWohtc0E= @@ -217,47 +240,60 @@ go.opentelemetry.io/otel/trace v1.40.0 h1:WA4etStDttCSYuhwvEa8OP8I5EWu24lkOzp+ZY go.opentelemetry.io/otel/trace v1.40.0/go.mod h1:zeAhriXecNGP/s2SEG3+Y8X9ujcJOTqQ5RgdEJcawiA= go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I= go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= +go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= go.yaml.in/yaml/v4 v4.0.0-rc.3 h1:3h1fjsh1CTAPjW7q/EMe+C8shx5d8ctzZTrLcs/j8Go= go.yaml.in/yaml/v4 v4.0.0-rc.3/go.mod h1:aZqd9kCMsGL7AuUv/m/PvWLdg5sjJsZ4oHDEnfPPfY0= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts= golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos= golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk= golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8= golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.50.0 h1:ucWh9eiCGyDR3vtzso0WMQinm2Dnt8cFMuQa9K33J60= golang.org/x/net v0.50.0/go.mod h1:UgoSli3F/pBgdJBHCTc+tp3gmrU4XswgGRgtnwWTfyM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4= golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k= golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg= golang.org/x/term v0.40.0/go.mod h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk= golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA= golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI= @@ -265,6 +301,7 @@ golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200325010219-a49f79bcc224/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k= golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/internal/app/act-cli/VERSION b/internal/app/act-cli/VERSION new file mode 100644 index 00000000..1d0ba9ea --- /dev/null +++ b/internal/app/act-cli/VERSION @@ -0,0 +1 @@ +0.4.0 diff --git a/internal/app/act-cli/main.go b/internal/app/act-cli/main.go new file mode 100644 index 00000000..13684c73 --- /dev/null +++ b/internal/app/act-cli/main.go @@ -0,0 +1,19 @@ +package main + +import ( + _ "embed" + + "gitea.com/gitea/act_runner/cmd" + "gitea.com/gitea/act_runner/pkg/common" +) + +//go:embed VERSION +var version string + +func main() { + ctx, cancel := common.CreateGracefulJobCancellationContext() + defer cancel() + + // run the command + cmd.Execute(ctx, version) +} diff --git a/internal/app/cmd/cache-server.go b/internal/app/cmd/cache-server.go index 1b495694..e35232b9 100644 --- a/internal/app/cmd/cache-server.go +++ b/internal/app/cmd/cache-server.go @@ -10,7 +10,7 @@ import ( "gitea.com/gitea/act_runner/internal/pkg/config" - "github.com/actions-oss/act-cli/pkg/artifactcache" + "gitea.com/gitea/act_runner/pkg/artifactcache" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/internal/app/cmd/exec.go b/internal/app/cmd/exec.go index 3146f484..5a9290ec 100644 --- a/internal/app/cmd/exec.go +++ b/internal/app/cmd/exec.go @@ -15,12 +15,12 @@ import ( "strings" "gitea.com/gitea/act_runner/internal/app/run" - "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/model" - "github.com/actions-oss/act-cli/pkg/runner" - "github.com/actions-oss/act-cli/pkg/schema" + "gitea.com/gitea/act_runner/pkg/artifactcache" + "gitea.com/gitea/act_runner/pkg/artifacts" + "gitea.com/gitea/act_runner/pkg/common" + "gitea.com/gitea/act_runner/pkg/model" + "gitea.com/gitea/act_runner/pkg/runner" + "gitea.com/gitea/act_runner/pkg/schema" "github.com/docker/docker/api/types/container" "github.com/joho/godotenv" log "github.com/sirupsen/logrus" diff --git a/internal/app/run/runner.go b/internal/app/run/runner.go index a2487d01..696ccecc 100644 --- a/internal/app/run/runner.go +++ b/internal/app/run/runner.go @@ -14,10 +14,10 @@ import ( runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "connectrpc.com/connect" - "github.com/actions-oss/act-cli/pkg/artifactcache" - "github.com/actions-oss/act-cli/pkg/model" - "github.com/actions-oss/act-cli/pkg/runner" - "github.com/actions-oss/act-cli/pkg/schema" + "gitea.com/gitea/act_runner/pkg/artifactcache" + "gitea.com/gitea/act_runner/pkg/model" + "gitea.com/gitea/act_runner/pkg/runner" + "gitea.com/gitea/act_runner/pkg/schema" "github.com/docker/docker/api/types/container" log "github.com/sirupsen/logrus" diff --git a/internal/app/run/workflow.go b/internal/app/run/workflow.go index 9736b103..3a7678c3 100644 --- a/internal/app/run/workflow.go +++ b/internal/app/run/workflow.go @@ -10,8 +10,8 @@ import ( "strings" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" - "github.com/actions-oss/act-cli/pkg/model" - "github.com/actions-oss/act-cli/pkg/schema" + "gitea.com/gitea/act_runner/pkg/model" + "gitea.com/gitea/act_runner/pkg/schema" "gopkg.in/yaml.v3" ) diff --git a/internal/app/run/workflow_test.go b/internal/app/run/workflow_test.go index 5e7a95b0..e40ba17b 100644 --- a/internal/app/run/workflow_test.go +++ b/internal/app/run/workflow_test.go @@ -7,7 +7,7 @@ import ( "testing" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" - "github.com/actions-oss/act-cli/pkg/model" + "gitea.com/gitea/act_runner/pkg/model" "github.com/stretchr/testify/require" "go.yaml.in/yaml/v4" "gotest.tools/v3/assert" diff --git a/internal/eval/v2/evaluator.go b/internal/eval/v2/evaluator.go index 8caa03dc..b7c7833b 100644 --- a/internal/eval/v2/evaluator.go +++ b/internal/eval/v2/evaluator.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - exprparser "github.com/actions-oss/act-cli/internal/expr" + exprparser "gitea.com/gitea/act_runner/internal/expr" ) // EvaluationContext holds variables that can be referenced in expressions. diff --git a/internal/eval/v2/functions.go b/internal/eval/v2/functions.go index bf90f81a..c55fe169 100644 --- a/internal/eval/v2/functions.go +++ b/internal/eval/v2/functions.go @@ -5,8 +5,8 @@ import ( "errors" "strings" - "github.com/actions-oss/act-cli/internal/eval/functions" - exprparser "github.com/actions-oss/act-cli/internal/expr" + "gitea.com/gitea/act_runner/internal/eval/functions" + exprparser "gitea.com/gitea/act_runner/internal/expr" ) type FromJSON struct { diff --git a/internal/model/token_utils.go b/internal/model/token_utils.go index dce92fb8..f14bd543 100644 --- a/internal/model/token_utils.go +++ b/internal/model/token_utils.go @@ -3,7 +3,7 @@ package model import ( "strings" - v2 "github.com/actions-oss/act-cli/internal/eval/v2" + v2 "gitea.com/gitea/act_runner/internal/eval/v2" "gopkg.in/yaml.v3" ) diff --git a/internal/model/workflow_state_test.go b/internal/model/workflow_state_test.go index 9cfe8eda..90ea372c 100644 --- a/internal/model/workflow_state_test.go +++ b/internal/model/workflow_state_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - v2 "github.com/actions-oss/act-cli/internal/eval/v2" - "github.com/actions-oss/act-cli/internal/templateeval" - "github.com/actions-oss/act-cli/pkg/schema" + v2 "gitea.com/gitea/act_runner/internal/eval/v2" + "gitea.com/gitea/act_runner/internal/templateeval" + "gitea.com/gitea/act_runner/pkg/schema" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "gopkg.in/yaml.v3" diff --git a/internal/templateeval/evaluate.go b/internal/templateeval/evaluate.go index 885c5326..9acaf2b2 100644 --- a/internal/templateeval/evaluate.go +++ b/internal/templateeval/evaluate.go @@ -5,9 +5,9 @@ import ( "fmt" "regexp" - v2 "github.com/actions-oss/act-cli/internal/eval/v2" - exprparser "github.com/actions-oss/act-cli/internal/expr" - "github.com/actions-oss/act-cli/pkg/schema" + v2 "gitea.com/gitea/act_runner/internal/eval/v2" + exprparser "gitea.com/gitea/act_runner/internal/expr" + "gitea.com/gitea/act_runner/pkg/schema" "gopkg.in/yaml.v3" ) diff --git a/internal/templateeval/evaluate_test.go b/internal/templateeval/evaluate_test.go index 3d69a30b..a17bf394 100644 --- a/internal/templateeval/evaluate_test.go +++ b/internal/templateeval/evaluate_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - v2 "github.com/actions-oss/act-cli/internal/eval/v2" - "github.com/actions-oss/act-cli/pkg/schema" + v2 "gitea.com/gitea/act_runner/internal/eval/v2" + "gitea.com/gitea/act_runner/pkg/schema" "github.com/stretchr/testify/require" "gopkg.in/yaml.v3" ) diff --git a/pkg/artifactcache/handler.go b/pkg/artifactcache/handler.go index d0fe5b4a..c8efa768 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/actions-oss/act-cli/pkg/common" + "gitea.com/gitea/act_runner/pkg/common" ) const ( diff --git a/pkg/artifacts/server.go b/pkg/artifacts/server.go index 1ac64018..b6d65379 100644 --- a/pkg/artifacts/server.go +++ b/pkg/artifacts/server.go @@ -15,7 +15,7 @@ import ( "github.com/julienschmidt/httprouter" - "github.com/actions-oss/act-cli/pkg/common" + "gitea.com/gitea/act_runner/pkg/common" ) type FileContainerResourceURL struct { diff --git a/pkg/artifacts/server_test.go b/pkg/artifacts/server_test.go index 6bfd35df..e5e00c20 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/actions-oss/act-cli/pkg/model" - "github.com/actions-oss/act-cli/pkg/runner" + "gitea.com/gitea/act_runner/pkg/model" + "gitea.com/gitea/act_runner/pkg/runner" ) type writableMapFile struct { diff --git a/pkg/common/git/git.go b/pkg/common/git/git.go index 8bf2f8fb..654c038d 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/actions-oss/act-cli/pkg/common" + "gitea.com/gitea/act_runner/pkg/common" ) var ( diff --git a/pkg/common/git/git_test.go b/pkg/common/git/git_test.go index fe1da240..0ade6635 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/actions-oss/act-cli/pkg/common" + "gitea.com/gitea/act_runner/pkg/common" ) func TestFindGitSlug(t *testing.T) { diff --git a/pkg/container/container_types.go b/pkg/container/container_types.go index 35f849fd..7ab7f8bb 100644 --- a/pkg/container/container_types.go +++ b/pkg/container/container_types.go @@ -5,7 +5,7 @@ import ( "io" "os" - "github.com/actions-oss/act-cli/pkg/common" + "gitea.com/gitea/act_runner/pkg/common" "github.com/docker/go-connections/nat" "golang.org/x/term" ) diff --git a/pkg/container/docker_auth.go b/pkg/container/docker_auth.go index 256332b6..c3a07bc3 100644 --- a/pkg/container/docker_auth.go +++ b/pkg/container/docker_auth.go @@ -6,7 +6,7 @@ import ( "context" "strings" - "github.com/actions-oss/act-cli/pkg/common" + "gitea.com/gitea/act_runner/pkg/common" "github.com/docker/cli/cli/config" "github.com/docker/cli/cli/config/credentials" "github.com/docker/docker/api/types/registry" diff --git a/pkg/container/docker_build.go b/pkg/container/docker_build.go index 5b2e041e..fe11f695 100644 --- a/pkg/container/docker_build.go +++ b/pkg/container/docker_build.go @@ -15,7 +15,7 @@ import ( "github.com/moby/patternmatcher" "github.com/moby/patternmatcher/ignorefile" - "github.com/actions-oss/act-cli/pkg/common" + "gitea.com/gitea/act_runner/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 c0f66109..f7641907 100644 --- a/pkg/container/docker_network.go +++ b/pkg/container/docker_network.go @@ -5,7 +5,7 @@ package container import ( "context" - "github.com/actions-oss/act-cli/pkg/common" + "gitea.com/gitea/act_runner/pkg/common" "github.com/docker/docker/api/types/network" ) diff --git a/pkg/container/docker_pull.go b/pkg/container/docker_pull.go index 03e9a1c1..7da8988e 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/actions-oss/act-cli/pkg/common" + "gitea.com/gitea/act_runner/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 3d94020f..33be46bd 100644 --- a/pkg/container/docker_run.go +++ b/pkg/container/docker_run.go @@ -35,8 +35,8 @@ import ( specs "github.com/opencontainers/image-spec/specs-go/v1" "github.com/spf13/pflag" - "github.com/actions-oss/act-cli/pkg/common" - "github.com/actions-oss/act-cli/pkg/filecollector" + "gitea.com/gitea/act_runner/pkg/common" + "gitea.com/gitea/act_runner/pkg/filecollector" ) // NewContainer creates a reference to a container diff --git a/pkg/container/docker_stub.go b/pkg/container/docker_stub.go index 929448ce..841b586e 100644 --- a/pkg/container/docker_stub.go +++ b/pkg/container/docker_stub.go @@ -6,8 +6,8 @@ import ( "context" "runtime" + "gitea.com/gitea/act_runner/pkg/common" "github.com/docker/docker/api/types/system" - "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 7f540554..502a36dc 100644 --- a/pkg/container/docker_volume.go +++ b/pkg/container/docker_volume.go @@ -5,7 +5,7 @@ package container import ( "context" - "github.com/actions-oss/act-cli/pkg/common" + "gitea.com/gitea/act_runner/pkg/common" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/volume" ) diff --git a/pkg/container/host_environment.go b/pkg/container/host_environment.go index 8a86e210..de514e66 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/actions-oss/act-cli/pkg/common" - "github.com/actions-oss/act-cli/pkg/filecollector" - "github.com/actions-oss/act-cli/pkg/lookpath" + "gitea.com/gitea/act_runner/pkg/common" + "gitea.com/gitea/act_runner/pkg/filecollector" + "gitea.com/gitea/act_runner/pkg/lookpath" ) type HostEnvironment struct { diff --git a/pkg/container/parse_env_file.go b/pkg/container/parse_env_file.go index 75efe314..971b522a 100644 --- a/pkg/container/parse_env_file.go +++ b/pkg/container/parse_env_file.go @@ -8,7 +8,7 @@ import ( "io" "strings" - "github.com/actions-oss/act-cli/pkg/common" + "gitea.com/gitea/act_runner/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 0f871403..67435a9f 100644 --- a/pkg/exprparser/functions.go +++ b/pkg/exprparser/functions.go @@ -1,6 +1,6 @@ package exprparser -import "github.com/actions-oss/act-cli/pkg/model" +import "gitea.com/gitea/act_runner/pkg/model" func (impl *interperterImpl) getNeedsTransitive(job *model.Job) []string { needs := job.Needs() diff --git a/pkg/exprparser/interpreter.go b/pkg/exprparser/interpreter.go index 362fb176..e8aba1c9 100644 --- a/pkg/exprparser/interpreter.go +++ b/pkg/exprparser/interpreter.go @@ -7,9 +7,9 @@ import ( "reflect" "strings" - eval "github.com/actions-oss/act-cli/internal/eval/v2" - exprparser "github.com/actions-oss/act-cli/internal/expr" - "github.com/actions-oss/act-cli/pkg/model" + eval "gitea.com/gitea/act_runner/internal/eval/v2" + exprparser "gitea.com/gitea/act_runner/internal/expr" + "gitea.com/gitea/act_runner/pkg/model" ) type EvaluationEnvironment struct { diff --git a/pkg/exprparser/interpreter_test.go b/pkg/exprparser/interpreter_test.go index 940b8ce3..7b1dbf53 100644 --- a/pkg/exprparser/interpreter_test.go +++ b/pkg/exprparser/interpreter_test.go @@ -4,7 +4,7 @@ import ( "math" "testing" - "github.com/actions-oss/act-cli/pkg/model" + "gitea.com/gitea/act_runner/pkg/model" "github.com/stretchr/testify/assert" ) diff --git a/pkg/model/action.go b/pkg/model/action.go index 1c7b231c..a7d8be2f 100644 --- a/pkg/model/action.go +++ b/pkg/model/action.go @@ -5,7 +5,7 @@ import ( "io" "strings" - "github.com/actions-oss/act-cli/pkg/schema" + "gitea.com/gitea/act_runner/pkg/schema" "gopkg.in/yaml.v3" ) diff --git a/pkg/model/github_context.go b/pkg/model/github_context.go index b64dbaad..584cae82 100644 --- a/pkg/model/github_context.go +++ b/pkg/model/github_context.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/actions-oss/act-cli/pkg/common" - "github.com/actions-oss/act-cli/pkg/common/git" + "gitea.com/gitea/act_runner/pkg/common" + "gitea.com/gitea/act_runner/pkg/common/git" ) type GithubContext struct { diff --git a/pkg/model/workflow.go b/pkg/model/workflow.go index 8d9221b9..95bc12f7 100644 --- a/pkg/model/workflow.go +++ b/pkg/model/workflow.go @@ -9,8 +9,8 @@ import ( "strconv" "strings" - "github.com/actions-oss/act-cli/pkg/common" - "github.com/actions-oss/act-cli/pkg/schema" + "gitea.com/gitea/act_runner/pkg/common" + "gitea.com/gitea/act_runner/pkg/schema" log "github.com/sirupsen/logrus" "gopkg.in/yaml.v3" ) diff --git a/pkg/runner/action.go b/pkg/runner/action.go index 19bd989d..85af576f 100644 --- a/pkg/runner/action.go +++ b/pkg/runner/action.go @@ -13,9 +13,9 @@ import ( "github.com/kballard/go-shellquote" - "github.com/actions-oss/act-cli/pkg/common" - "github.com/actions-oss/act-cli/pkg/container" - "github.com/actions-oss/act-cli/pkg/model" + "gitea.com/gitea/act_runner/pkg/common" + "gitea.com/gitea/act_runner/pkg/container" + "gitea.com/gitea/act_runner/pkg/model" ) type actionStep interface { diff --git a/pkg/runner/action_cache.go b/pkg/runner/action_cache.go index 3baf9c76..045f7820 100644 --- a/pkg/runner/action_cache.go +++ b/pkg/runner/action_cache.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "github.com/actions-oss/act-cli/pkg/common" + "gitea.com/gitea/act_runner/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" diff --git a/pkg/runner/action_cache_offline_mode.go b/pkg/runner/action_cache_offline_mode.go index 48bb721e..dc829edf 100644 --- a/pkg/runner/action_cache_offline_mode.go +++ b/pkg/runner/action_cache_offline_mode.go @@ -5,7 +5,7 @@ import ( "io" "path" - "github.com/actions-oss/act-cli/pkg/common" + "gitea.com/gitea/act_runner/pkg/common" git "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing" ) diff --git a/pkg/runner/action_composite.go b/pkg/runner/action_composite.go index f0efa70a..bb481ecd 100644 --- a/pkg/runner/action_composite.go +++ b/pkg/runner/action_composite.go @@ -6,8 +6,8 @@ import ( "regexp" "strings" - "github.com/actions-oss/act-cli/pkg/common" - "github.com/actions-oss/act-cli/pkg/model" + "gitea.com/gitea/act_runner/pkg/common" + "gitea.com/gitea/act_runner/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 964a6575..8e9e907c 100644 --- a/pkg/runner/action_test.go +++ b/pkg/runner/action_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/actions-oss/act-cli/pkg/model" + "gitea.com/gitea/act_runner/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 ada2241d..7a31c1e0 100644 --- a/pkg/runner/command.go +++ b/pkg/runner/command.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - "github.com/actions-oss/act-cli/pkg/common" + "gitea.com/gitea/act_runner/pkg/common" "github.com/sirupsen/logrus" ) diff --git a/pkg/runner/command_test.go b/pkg/runner/command_test.go index 3d0f3fda..314077fd 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/actions-oss/act-cli/pkg/common" - "github.com/actions-oss/act-cli/pkg/model" + "gitea.com/gitea/act_runner/pkg/common" + "gitea.com/gitea/act_runner/pkg/model" ) func TestSetEnv(t *testing.T) { diff --git a/pkg/runner/container_mock_test.go b/pkg/runner/container_mock_test.go index 098ab697..195be995 100644 --- a/pkg/runner/container_mock_test.go +++ b/pkg/runner/container_mock_test.go @@ -4,8 +4,8 @@ import ( "context" "io" - "github.com/actions-oss/act-cli/pkg/common" - "github.com/actions-oss/act-cli/pkg/container" + "gitea.com/gitea/act_runner/pkg/common" + "gitea.com/gitea/act_runner/pkg/container" "github.com/stretchr/testify/mock" ) diff --git a/pkg/runner/expression.go b/pkg/runner/expression.go index 1203ba90..976e87dc 100644 --- a/pkg/runner/expression.go +++ b/pkg/runner/expression.go @@ -12,10 +12,10 @@ import ( _ "embed" - "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" + "gitea.com/gitea/act_runner/pkg/common" + "gitea.com/gitea/act_runner/pkg/container" + "gitea.com/gitea/act_runner/pkg/exprparser" + "gitea.com/gitea/act_runner/pkg/model" "gopkg.in/yaml.v3" ) diff --git a/pkg/runner/expression_test.go b/pkg/runner/expression_test.go index 34d5f92a..ec78f24f 100644 --- a/pkg/runner/expression_test.go +++ b/pkg/runner/expression_test.go @@ -8,8 +8,8 @@ import ( "sort" "testing" - "github.com/actions-oss/act-cli/pkg/exprparser" - "github.com/actions-oss/act-cli/pkg/model" + "gitea.com/gitea/act_runner/pkg/exprparser" + "gitea.com/gitea/act_runner/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 bf8db520..3752f553 100644 --- a/pkg/runner/job_executor.go +++ b/pkg/runner/job_executor.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/actions-oss/act-cli/pkg/common" - "github.com/actions-oss/act-cli/pkg/model" + "gitea.com/gitea/act_runner/pkg/common" + "gitea.com/gitea/act_runner/pkg/model" ) type jobInfo interface { diff --git a/pkg/runner/job_executor_test.go b/pkg/runner/job_executor_test.go index 27adcc67..ce815d1c 100644 --- a/pkg/runner/job_executor_test.go +++ b/pkg/runner/job_executor_test.go @@ -6,9 +6,9 @@ import ( "io" "testing" - "github.com/actions-oss/act-cli/pkg/common" - "github.com/actions-oss/act-cli/pkg/container" - "github.com/actions-oss/act-cli/pkg/model" + "gitea.com/gitea/act_runner/pkg/common" + "gitea.com/gitea/act_runner/pkg/container" + "gitea.com/gitea/act_runner/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 7f7f44e1..bc701145 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/actions-oss/act-cli/pkg/common" - "github.com/actions-oss/act-cli/pkg/filecollector" + "gitea.com/gitea/act_runner/pkg/common" + "gitea.com/gitea/act_runner/pkg/filecollector" ) type LocalRepositoryCache struct { diff --git a/pkg/runner/logger.go b/pkg/runner/logger.go index ec1f1817..b27c2d1d 100644 --- a/pkg/runner/logger.go +++ b/pkg/runner/logger.go @@ -9,7 +9,7 @@ import ( "strings" "sync" - "github.com/actions-oss/act-cli/pkg/common" + "gitea.com/gitea/act_runner/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 85511c6e..8bbdfcfa 100644 --- a/pkg/runner/reusable_workflow.go +++ b/pkg/runner/reusable_workflow.go @@ -7,8 +7,8 @@ import ( "path" "regexp" - "github.com/actions-oss/act-cli/pkg/common" - "github.com/actions-oss/act-cli/pkg/model" + "gitea.com/gitea/act_runner/pkg/common" + "gitea.com/gitea/act_runner/pkg/model" ) func newLocalReusableWorkflowExecutor(rc *RunContext) common.Executor { diff --git a/pkg/runner/run_context.go b/pkg/runner/run_context.go index 5a4a5e25..5b7bec0e 100644 --- a/pkg/runner/run_context.go +++ b/pkg/runner/run_context.go @@ -20,10 +20,10 @@ 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" + "gitea.com/gitea/act_runner/pkg/common" + "gitea.com/gitea/act_runner/pkg/container" + "gitea.com/gitea/act_runner/pkg/exprparser" + "gitea.com/gitea/act_runner/pkg/model" "github.com/docker/go-connections/nat" "github.com/opencontainers/selinux/go-selinux" "github.com/sirupsen/logrus" diff --git a/pkg/runner/run_context_darwin.go b/pkg/runner/run_context_darwin.go index 8f6713d8..5b1072f8 100644 --- a/pkg/runner/run_context_darwin.go +++ b/pkg/runner/run_context_darwin.go @@ -10,9 +10,9 @@ import ( "path/filepath" "strings" - "github.com/actions-oss/act-cli/pkg/common" - "github.com/actions-oss/act-cli/pkg/container" - "github.com/actions-oss/act-cli/pkg/tart" + "gitea.com/gitea/act_runner/pkg/common" + "gitea.com/gitea/act_runner/pkg/container" + "gitea.com/gitea/act_runner/pkg/tart" ) func (rc *RunContext) startTartEnvironment() common.Executor { diff --git a/pkg/runner/run_context_other.go b/pkg/runner/run_context_other.go index 5f605220..9235a5df 100644 --- a/pkg/runner/run_context_other.go +++ b/pkg/runner/run_context_other.go @@ -6,7 +6,7 @@ import ( "context" "fmt" - "github.com/actions-oss/act-cli/pkg/common" + "gitea.com/gitea/act_runner/pkg/common" ) func (rc *RunContext) startTartEnvironment() common.Executor { diff --git a/pkg/runner/run_context_test.go b/pkg/runner/run_context_test.go index d4b94285..f66954b8 100644 --- a/pkg/runner/run_context_test.go +++ b/pkg/runner/run_context_test.go @@ -10,8 +10,8 @@ import ( "strings" "testing" - "github.com/actions-oss/act-cli/pkg/exprparser" - "github.com/actions-oss/act-cli/pkg/model" + "gitea.com/gitea/act_runner/pkg/exprparser" + "gitea.com/gitea/act_runner/pkg/model" "github.com/golang-jwt/jwt/v5" log "github.com/sirupsen/logrus" diff --git a/pkg/runner/runner.go b/pkg/runner/runner.go index 430f0928..b433b411 100644 --- a/pkg/runner/runner.go +++ b/pkg/runner/runner.go @@ -8,8 +8,8 @@ import ( "regexp" "runtime" - "github.com/actions-oss/act-cli/pkg/common" - "github.com/actions-oss/act-cli/pkg/model" + "gitea.com/gitea/act_runner/pkg/common" + "gitea.com/gitea/act_runner/pkg/model" docker_container "github.com/docker/docker/api/types/container" log "github.com/sirupsen/logrus" "golang.org/x/sync/semaphore" diff --git a/pkg/runner/runner_test.go b/pkg/runner/runner_test.go index f0714061..14f88cfe 100644 --- a/pkg/runner/runner_test.go +++ b/pkg/runner/runner_test.go @@ -20,8 +20,8 @@ import ( assert "github.com/stretchr/testify/assert" "gopkg.in/yaml.v3" - "github.com/actions-oss/act-cli/pkg/common" - "github.com/actions-oss/act-cli/pkg/model" + "gitea.com/gitea/act_runner/pkg/common" + "gitea.com/gitea/act_runner/pkg/model" ) var ( diff --git a/pkg/runner/step.go b/pkg/runner/step.go index 06365230..20ff1b3e 100644 --- a/pkg/runner/step.go +++ b/pkg/runner/step.go @@ -11,10 +11,10 @@ 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" + "gitea.com/gitea/act_runner/pkg/common" + "gitea.com/gitea/act_runner/pkg/container" + "gitea.com/gitea/act_runner/pkg/exprparser" + "gitea.com/gitea/act_runner/pkg/model" "github.com/sirupsen/logrus" ) diff --git a/pkg/runner/step_action_local.go b/pkg/runner/step_action_local.go index 580b60bb..f70cdedd 100644 --- a/pkg/runner/step_action_local.go +++ b/pkg/runner/step_action_local.go @@ -10,8 +10,8 @@ import ( "os" "path" - "github.com/actions-oss/act-cli/pkg/common" - "github.com/actions-oss/act-cli/pkg/model" + "gitea.com/gitea/act_runner/pkg/common" + "gitea.com/gitea/act_runner/pkg/model" ) type stepActionLocal struct { diff --git a/pkg/runner/step_action_local_test.go b/pkg/runner/step_action_local_test.go index 44f7d2d7..f5841255 100644 --- a/pkg/runner/step_action_local_test.go +++ b/pkg/runner/step_action_local_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/actions-oss/act-cli/pkg/common" - "github.com/actions-oss/act-cli/pkg/model" + "gitea.com/gitea/act_runner/pkg/common" + "gitea.com/gitea/act_runner/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 20d462d3..72f3930b 100644 --- a/pkg/runner/step_action_remote.go +++ b/pkg/runner/step_action_remote.go @@ -11,8 +11,8 @@ import ( "regexp" "strings" - "github.com/actions-oss/act-cli/pkg/common" - "github.com/actions-oss/act-cli/pkg/model" + "gitea.com/gitea/act_runner/pkg/common" + "gitea.com/gitea/act_runner/pkg/model" ) type stepActionRemote struct { diff --git a/pkg/runner/step_action_remote_test.go b/pkg/runner/step_action_remote_test.go index 630163c5..926ba77b 100644 --- a/pkg/runner/step_action_remote_test.go +++ b/pkg/runner/step_action_remote_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/mock" "gopkg.in/yaml.v3" - "github.com/actions-oss/act-cli/pkg/common" - "github.com/actions-oss/act-cli/pkg/model" + "gitea.com/gitea/act_runner/pkg/common" + "gitea.com/gitea/act_runner/pkg/model" ) type stepActionRemoteMocks struct { diff --git a/pkg/runner/step_docker.go b/pkg/runner/step_docker.go index 0c927e53..2c3e0db1 100644 --- a/pkg/runner/step_docker.go +++ b/pkg/runner/step_docker.go @@ -5,9 +5,9 @@ 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" + "gitea.com/gitea/act_runner/pkg/common" + "gitea.com/gitea/act_runner/pkg/container" + "gitea.com/gitea/act_runner/pkg/model" "github.com/kballard/go-shellquote" ) diff --git a/pkg/runner/step_docker_test.go b/pkg/runner/step_docker_test.go index 28238bad..94fec3f8 100644 --- a/pkg/runner/step_docker_test.go +++ b/pkg/runner/step_docker_test.go @@ -6,8 +6,8 @@ import ( "io" "testing" - "github.com/actions-oss/act-cli/pkg/container" - "github.com/actions-oss/act-cli/pkg/model" + "gitea.com/gitea/act_runner/pkg/container" + "gitea.com/gitea/act_runner/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 937871be..e6c8ddf7 100644 --- a/pkg/runner/step_factory.go +++ b/pkg/runner/step_factory.go @@ -3,7 +3,7 @@ package runner import ( "fmt" - "github.com/actions-oss/act-cli/pkg/model" + "gitea.com/gitea/act_runner/pkg/model" ) type stepFactory interface { diff --git a/pkg/runner/step_factory_test.go b/pkg/runner/step_factory_test.go index 7e16ed97..1c6dacf6 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/actions-oss/act-cli/pkg/model" + "gitea.com/gitea/act_runner/pkg/model" "github.com/stretchr/testify/assert" ) diff --git a/pkg/runner/step_run.go b/pkg/runner/step_run.go index bce9ad94..db060e26 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/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" + "gitea.com/gitea/act_runner/pkg/common" + "gitea.com/gitea/act_runner/pkg/container" + "gitea.com/gitea/act_runner/pkg/lookpath" + "gitea.com/gitea/act_runner/pkg/model" ) type stepRun struct { diff --git a/pkg/runner/step_run_test.go b/pkg/runner/step_run_test.go index a0fcbb13..a978f32b 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/actions-oss/act-cli/pkg/container" - "github.com/actions-oss/act-cli/pkg/model" + "gitea.com/gitea/act_runner/pkg/container" + "gitea.com/gitea/act_runner/pkg/model" ) func TestStepRun(t *testing.T) { diff --git a/pkg/runner/step_test.go b/pkg/runner/step_test.go index 4f7b336a..c698b59c 100644 --- a/pkg/runner/step_test.go +++ b/pkg/runner/step_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/actions-oss/act-cli/pkg/common" - "github.com/actions-oss/act-cli/pkg/model" + "gitea.com/gitea/act_runner/pkg/common" + "gitea.com/gitea/act_runner/pkg/model" log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/pkg/schema/schema.go b/pkg/schema/schema.go index c0a48d63..73f07cce 100644 --- a/pkg/schema/schema.go +++ b/pkg/schema/schema.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - exprparser "github.com/actions-oss/act-cli/internal/expr" + exprparser "gitea.com/gitea/act_runner/internal/expr" "gopkg.in/yaml.v3" ) diff --git a/pkg/tart/environment_darwin.go b/pkg/tart/environment_darwin.go index 2cf5454e..8184840e 100644 --- a/pkg/tart/environment_darwin.go +++ b/pkg/tart/environment_darwin.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "github.com/actions-oss/act-cli/pkg/common" - "github.com/actions-oss/act-cli/pkg/container" + "gitea.com/gitea/act_runner/pkg/common" + "gitea.com/gitea/act_runner/pkg/container" "github.com/kballard/go-shellquote" ) diff --git a/pkg/tart/vm_darwin.go b/pkg/tart/vm_darwin.go index 446acea8..54a1ad31 100644 --- a/pkg/tart/vm_darwin.go +++ b/pkg/tart/vm_darwin.go @@ -13,7 +13,7 @@ import ( "strings" "syscall" - "github.com/actions-oss/act-cli/pkg/common" + "gitea.com/gitea/act_runner/pkg/common" "github.com/avast/retry-go" "golang.org/x/crypto/ssh" )