Compare commits

...
Author SHA1 Message Date
Lunny Xiao 2fa5fe7121 fix: follow the act move in the paths outside Go code
`make test-dind` runs a hardcoded package path, and the `.gitignore`
negation for the test secrets fixture stopped matching.

Assisted-by: Codet:GPT-5.1-Codex
2026-08-07 21:49:42 -07:00
Lunny Xiao 825c6af07c refactor: move act under internal
The runner is an application, not a library. `act/model` and
`act/exprparser` were the last packages anything outside this repository
consumed and they now live in actionslib, so nothing needs the rest of
`act` to be importable, and keeping it importable invites the coupling
that was just removed.

Import paths only, the files are unchanged.

Assisted-by: Codet:GPT-5.1-Codex
2026-08-07 21:40:48 -07:00
267 changed files with 101 additions and 101 deletions
+2 -2
View File
@@ -24,7 +24,7 @@ jobs:
check-latest: true check-latest: true
- name: prepare anonymous docker config - name: prepare anonymous docker config
run: mkdir -p "$DOCKER_CONFIG" && echo '{}' > "$DOCKER_CONFIG/config.json" run: mkdir -p "$DOCKER_CONFIG" && echo '{}' > "$DOCKER_CONFIG/config.json"
# Pre-pull act/runner's two largest base images so a slow pull can't dominate `make test`; # Pre-pull internal/act/runner's two largest base images so a slow pull can't dominate `make test`;
# the rest (alpine/ubuntu) pull on demand, absorbed by the make-test -timeout. The host # the rest (alpine/ubuntu) pull on demand, absorbed by the make-test -timeout. The host
# daemon retains them between runs, so this is usually a fast manifest re-check. # daemon retains them between runs, so this is usually a fast manifest re-check.
- name: pre-pull test images - name: pre-pull test images
@@ -48,4 +48,4 @@ jobs:
- name: coverage report - name: coverage report
run: | run: |
make coverage-report make coverage-report
cat .tmp/coverage.md >> "$GITHUB_STEP_SUMMARY" cat .tmp/coverage.md >> "$GITHUB_STEP_SUMMARY"
+2 -2
View File
@@ -1,6 +1,6 @@
/gitea-runner /gitea-runner
.env .env
!/act/runner/testdata/secrets/.env !/internal/act/runner/testdata/secrets/.env
.runner .runner
.runner.lock .runner.lock
coverage.txt coverage.txt
@@ -14,4 +14,4 @@ coverage.txt
__debug_bin __debug_bin
# gorelease binary folder # gorelease binary folder
/dist /dist
.DS_Store .DS_Store
@@ -26,7 +26,7 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/internal/act/common"
"github.com/julienschmidt/httprouter" "github.com/julienschmidt/httprouter"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
@@ -17,7 +17,7 @@ import (
"strings" "strings"
"time" "time"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/internal/act/common"
"github.com/julienschmidt/httprouter" "github.com/julienschmidt/httprouter"
) )
@@ -15,7 +15,7 @@ import (
"strings" "strings"
"sync" "sync"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/internal/act/common"
"gitea.com/gitea/runner/internal/pkg/lock" "gitea.com/gitea/runner/internal/pkg/lock"
"github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5"
@@ -16,7 +16,7 @@ import (
"testing" "testing"
"time" "time"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/internal/act/common"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
logrustest "github.com/sirupsen/logrus/hooks/test" logrustest "github.com/sirupsen/logrus/hooks/test"
@@ -10,7 +10,7 @@ import (
"fmt" "fmt"
"io" "io"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/internal/act/common"
"github.com/docker/go-connections/nat" "github.com/docker/go-connections/nat"
"github.com/moby/moby/api/types/container" "github.com/moby/moby/api/types/container"
@@ -9,7 +9,7 @@ package container
import ( import (
"context" "context"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/internal/act/common"
"github.com/distribution/reference" "github.com/distribution/reference"
"github.com/docker/cli/cli/config" "github.com/docker/cli/cli/config"
@@ -12,7 +12,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/internal/act/common"
"github.com/moby/go-archive" "github.com/moby/go-archive"
"github.com/moby/go-archive/compression" "github.com/moby/go-archive/compression"
@@ -13,7 +13,7 @@ import (
"strings" "strings"
"time" "time"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/internal/act/common"
"github.com/moby/moby/client" "github.com/moby/moby/client"
) )
@@ -11,7 +11,7 @@ import (
"fmt" "fmt"
"strings" "strings"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/internal/act/common"
"github.com/distribution/reference" "github.com/distribution/reference"
"github.com/moby/moby/api/pkg/authconfig" "github.com/moby/moby/api/pkg/authconfig"
@@ -22,8 +22,8 @@ import (
"strings" "strings"
"time" "time"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/internal/act/common"
"gitea.com/gitea/runner/act/filecollector" "gitea.com/gitea/runner/internal/act/filecollector"
"dario.cat/mergo" "dario.cat/mergo"
cerrdefs "github.com/containerd/errdefs" cerrdefs "github.com/containerd/errdefs"
@@ -19,7 +19,7 @@ import (
"testing" "testing"
"time" "time"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/internal/act/common"
cerrdefs "github.com/containerd/errdefs" cerrdefs "github.com/containerd/errdefs"
"github.com/moby/moby/api/pkg/stdcopy" "github.com/moby/moby/api/pkg/stdcopy"
@@ -12,7 +12,7 @@ import (
"runtime" "runtime"
"time" "time"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/internal/act/common"
"github.com/moby/moby/api/types/system" "github.com/moby/moby/api/types/system"
) )
@@ -9,7 +9,7 @@ package container
import ( import (
"context" "context"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/internal/act/common"
"github.com/moby/moby/client" "github.com/moby/moby/client"
) )
@@ -21,9 +21,9 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/internal/act/common"
"gitea.com/gitea/runner/act/filecollector" "gitea.com/gitea/runner/internal/act/filecollector"
"gitea.com/gitea/runner/act/lookpath" "gitea.com/gitea/runner/internal/act/lookpath"
"gitea.com/gitea/runner/internal/pkg/process" "gitea.com/gitea/runner/internal/pkg/process"
"github.com/go-git/go-billy/v5/helper/polyfill" "github.com/go-git/go-billy/v5/helper/polyfill"
@@ -17,7 +17,7 @@ import (
"testing" "testing"
"time" "time"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/internal/act/common"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
@@ -12,7 +12,7 @@ import (
"io" "io"
"strings" "strings"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/internal/act/common"
"golang.org/x/text/encoding/unicode" "golang.org/x/text/encoding/unicode"
"golang.org/x/text/transform" "golang.org/x/text/transform"
@@ -13,8 +13,8 @@ import (
"fmt" "fmt"
"strings" "strings"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/internal/act/common"
"gitea.com/gitea/runner/act/common/git" "gitea.com/gitea/runner/internal/act/common/git"
"gitea.dev/actionslib/pkg/model" "gitea.dev/actionslib/pkg/model"
) )
@@ -20,9 +20,9 @@ import (
"runtime" "runtime"
"strings" "strings"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/internal/act/common"
"gitea.com/gitea/runner/act/common/git" "gitea.com/gitea/runner/internal/act/common/git"
"gitea.com/gitea/runner/act/container" "gitea.com/gitea/runner/internal/act/container"
"gitea.dev/actionslib/pkg/model" "gitea.dev/actionslib/pkg/model"
"github.com/kballard/go-shellquote" "github.com/kballard/go-shellquote"
@@ -17,7 +17,7 @@ import (
"testing" "testing"
"time" "time"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/internal/act/common"
"gitea.dev/actionslib/pkg/model" "gitea.dev/actionslib/pkg/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
@@ -31,7 +31,7 @@ func runGit(t *testing.T, dir string, args ...string) {
} }
cmd := exec.Command("git", args...) cmd := exec.Command("git", args...)
// Fixed identity and host-config isolation so commits succeed offline regardless of the // Fixed identity and host-config isolation so commits succeed offline regardless of the
// host's git config (mirrors gitCmd in act/common/git). // host's git config (mirrors gitCmd in internal/act/common/git).
cmd.Env = append(os.Environ(), cmd.Env = append(os.Environ(),
"GIT_AUTHOR_NAME=test", "[email protected]", "GIT_AUTHOR_NAME=test", "[email protected]",
"GIT_COMMITTER_NAME=test", "[email protected]", "GIT_COMMITTER_NAME=test", "[email protected]",
@@ -12,7 +12,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/internal/act/common"
"gitea.dev/actionslib/pkg/model" "gitea.dev/actionslib/pkg/model"
) )
@@ -13,9 +13,9 @@ import (
"testing" "testing"
"time" "time"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/internal/act/common"
"gitea.com/gitea/runner/act/common/git" "gitea.com/gitea/runner/internal/act/common/git"
"gitea.com/gitea/runner/act/container" "gitea.com/gitea/runner/internal/act/container"
"gitea.dev/actionslib/pkg/model" "gitea.dev/actionslib/pkg/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
@@ -8,7 +8,7 @@ import (
"testing" "testing"
"time" "time"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/internal/act/common"
"gitea.dev/actionslib/pkg/exprparser" "gitea.dev/actionslib/pkg/exprparser"
"gitea.dev/actionslib/pkg/model" "gitea.dev/actionslib/pkg/model"
@@ -10,7 +10,7 @@ import (
"regexp" "regexp"
"strings" "strings"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/internal/act/common"
) )
var commandPatternGA *regexp.Regexp var commandPatternGA *regexp.Regexp
@@ -11,7 +11,7 @@ import (
"os" "os"
"testing" "testing"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/internal/act/common"
"gitea.dev/actionslib/pkg/model" "gitea.dev/actionslib/pkg/model"
"github.com/sirupsen/logrus/hooks/test" "github.com/sirupsen/logrus/hooks/test"
@@ -8,8 +8,8 @@ import (
"context" "context"
"io" "io"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/internal/act/common"
"gitea.com/gitea/runner/act/container" "gitea.com/gitea/runner/internal/act/container"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
) )
@@ -15,8 +15,8 @@ import (
"strings" "strings"
"time" "time"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/internal/act/common"
"gitea.com/gitea/runner/act/container" "gitea.com/gitea/runner/internal/act/container"
_ "embed" _ "embed"
@@ -9,7 +9,7 @@ import (
"runtime" "runtime"
"testing" "testing"
"gitea.com/gitea/runner/act/container" "gitea.com/gitea/runner/internal/act/container"
mobyclient "github.com/moby/moby/client" mobyclient "github.com/moby/moby/client"
) )
@@ -21,8 +21,8 @@ import (
"time" "time"
"unicode" "unicode"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/internal/act/common"
"gitea.com/gitea/runner/act/container" "gitea.com/gitea/runner/internal/act/container"
"gitea.dev/actionslib/pkg/exprparser" "gitea.dev/actionslib/pkg/exprparser"
"gitea.dev/actionslib/pkg/model" "gitea.dev/actionslib/pkg/model"
@@ -20,8 +20,8 @@ import (
"testing" "testing"
"time" "time"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/internal/act/common"
"gitea.com/gitea/runner/act/container" "gitea.com/gitea/runner/internal/act/container"
"gitea.dev/actionslib/pkg/model" "gitea.dev/actionslib/pkg/model"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
@@ -11,8 +11,8 @@ import (
"path" "path"
"strings" "strings"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/internal/act/common"
"gitea.com/gitea/runner/act/container" "gitea.com/gitea/runner/internal/act/container"
) )
// GitHub's job-hook variables, read as a fallback when the settings are unset. // GitHub's job-hook variables, read as a fallback when the settings are unset.
@@ -11,7 +11,7 @@ import (
"maps" "maps"
"testing" "testing"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/internal/act/common"
"gitea.dev/actionslib/pkg/model" "gitea.dev/actionslib/pkg/model"
"github.com/sirupsen/logrus/hooks/test" "github.com/sirupsen/logrus/hooks/test"
@@ -16,7 +16,7 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"gitea.com/gitea/runner/act/filecollector" "gitea.com/gitea/runner/internal/act/filecollector"
) )
type LocalRepositoryCache struct { type LocalRepositoryCache struct {
@@ -17,7 +17,7 @@ import (
"strings" "strings"
"sync" "sync"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/internal/act/common"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"golang.org/x/term" "golang.org/x/term"

Some files were not shown because too many files have changed in this diff Show More