oss/forgejo-runner
oss/forgejo-runner
1
0
Fork 0
mirror of https://code.forgejo.org/forgejo/runner.git synced 2025-09-15 18:57:01 +00:00
Code Wiki Activity

chore: use the act directory instead of https://code.forgejo.org/forgejo/act (#754)

Browse source 
Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/754
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
This commit is contained in:
earl-warren 2025-07-28 18:44:45 +00:00
commit bfc833cdc5
No known key found for this signature in database
GPG key ID: F128CBE6AB3A7201
71 changed files with 234 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

78
.forgejo/workflows/act.yml Normal file
View file

@ -0,0 +1,78 @@
name: act
on:
push:
branches:
- 'main'
pull_request:
env:
GOPROXY: https://goproxy.io,direct
GOPATH: /go_path
GOCACHE: /go_cache
jobs:
unit:
runs-on: docker
container:
image: 'code.forgejo.org/oci/node:22-bookworm'
steps:
- name: cache go path
id: cache-go-path
uses: https://code.forgejo.org/actions/cache@v4
with:
path: /go_path
key: go_path-${{ forge.repository }}-${{ forge.ref_name }}
restore-keys: |
go_path-${{ forge.repository }}-
go_path-
- name: cache go cache
id: cache-go-cache
uses: https://code.forgejo.org/actions/cache@v4
with:
path: /go_cache
key: go_cache-${{ forge.repository }}-${{ forge.ref_name }}
restore-keys: |
go_cache-${{ forge.repository }}-
go_cache-
- uses: https://code.forgejo.org/actions/checkout@v4
- uses: https://code.forgejo.org/actions/setup-go@v5
with:
go-version-file: go.mod
- name: validate go version
run: |
set -ex
toolchain=$(grep -oP '(?<=toolchain ).+' go.mod)
version=$(go version | cut -d' ' -f3)
if dpkg --compare-versions ${version#go} lt ${toolchain#go}; then
echo "go version too low: $toolchain >= $version"
exit 1
fi
- name: unit test
run: |
go test -short -v ./act/container
go test -v ./act/artifactcache/... ./act/workflowpattern/... ./act/filecollector/... ./act/common/... ./act/jobparser ./act/model ./act/exprparser ./act/schema
integration:
runs-on: lxc-bookworm
needs: [unit]
steps:
- uses: https://code.forgejo.org/actions/checkout@v4
- uses: https://code.forgejo.org/actions/setup-go@v5
with:
go-version-file: go.mod
- name: apt install docker.io
run: |
export DEBIAN_FRONTEND=noninteractive
apt-get update -qq
apt-get -q install -qq -y docker.io
- name: integration test
run: |
go test -v ./act/container
go test -v ./act/runner/...

2
Makefile
View file

@ -11,7 +11,7 @@ LINUX_ARCHS ?= linux/amd64,linux/arm64
DARWIN_ARCHS ?= darwin-12/amd64,darwin-12/arm64
WINDOWS_ARCHS ?= windows/amd64
GO_FMT_FILES := $(shell find . -type f -name "*.go" ! -name "generated.*")
GOFILES := $(shell find main.go internal -type f -name "*.go" -o -name "go.mod" ! -name "generated.*")
GOFILES := $(shell find . -type f -name "*.go" -o -name "go.mod" ! -name "generated.*")
MOCKERY_PACKAGE ?= github.com/vektra/mockery/v2@v2.53.4 # renovate: datasource=go
GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.3.0 # renovate: datasource=go

21
README.md
View file

@ -21,7 +21,7 @@ Work may be in progress for other architectures and you can browse the correspon
# Hacking
The Forgejo runner depends on [a fork of ACT](https://code.forgejo.org/forgejo/act) and is a dependency of the [setup-forgejo action](https://code.forgejo.org/actions/setup-forgejo). See [the full dependency graph](https://code.forgejo.org/actions/cascading-pr/#forgejo-dependencies) for a global view.
The Forgejo runner is a dependency of the [setup-forgejo action](https://code.forgejo.org/actions/setup-forgejo). See [the full dependency graph](https://code.forgejo.org/actions/cascading-pr/#forgejo-dependencies) for a global view.
## Building
@ -42,7 +42,6 @@ If there are changes, commit them to the repository.
The repositories are checked out in the same directory:
- **runner**: [Forgejo runner](https://code.forgejo.org/forgejo/runner)
- **act**: [ACT](https://code.forgejo.org/forgejo/act)
- **setup-forgejo**: [setup-forgejo](https://code.forgejo.org/actions/setup-forgejo)
### Install dependencies
@ -53,21 +52,7 @@ The dependencies are installed manually or with:
setup-forgejo/forgejo-dependencies.sh
```
### Build the Forgejo runner with the local ACT
The Forgejo runner is rebuilt with the ACT directory by changing the `runner/go.mod` file to:
```
replace github.com/nektos/act => ../act
```
Running:
```
cd runner ; go mod tidy
```
Building:
### Build the Forgejo runner
```shell
cd runner ; rm -f forgejo-runner ; make forgejo-runner
@ -88,7 +73,7 @@ The user is `root` with password `admin1234`. The runner is registered with:
```
cd setup-forgejo
docker exec --user 1000 forgejo forgejo actions generate-runner-token > forgejo-runner-token
../runner/forgejo-runner register --no-interactive --instance "$(cat forgejo-url)" --name runner --token $(cat forgejo-runner-token) --labels docker:docker://node:20-bullseye,self-hosted:host://-self-hosted,lxc:lxc://debian:bullseye
../runner/forgejo-runner register --no-interactive --instance "$(cat forgejo-url)" --name runner --token $(cat forgejo-runner-token) --labels docker:docker://node:22-bookworm,self-hosted:host,lxc:lxc://debian:bookworm
```
And launched with:

4
act/artifactcache/handler.go
View file

@ -20,8 +20,8 @@ import (
"github.com/timshannon/bolthold"
"go.etcd.io/bbolt"
"github.com/nektos/act/pkg/cacheproxy"
"github.com/nektos/act/pkg/common"
"code.forgejo.org/forgejo/runner/act/cacheproxy"
"code.forgejo.org/forgejo/runner/act/common"
)
const (

2
act/artifactcache/mac.go
View file

@ -11,7 +11,7 @@ import (
"strconv"
"time"
"github.com/nektos/act/pkg/cacheproxy"
"code.forgejo.org/forgejo/runner/act/cacheproxy"
)
var ErrValidation = errors.New("validation error")

2
act/artifactcache/mac_test.go
View file

@ -5,7 +5,7 @@ import (
"testing"
"time"
"github.com/nektos/act/pkg/cacheproxy"
"code.forgejo.org/forgejo/runner/act/cacheproxy"
"github.com/stretchr/testify/require"
)

2
act/cacheproxy/handler.go
View file

@ -22,7 +22,7 @@ import (
"github.com/julienschmidt/httprouter"
"github.com/sirupsen/logrus"
"github.com/nektos/act/pkg/common"
"code.forgejo.org/forgejo/runner/act/common"
)
const (

2
act/common/git/git.go
View file

@ -19,7 +19,7 @@ import (
"github.com/mattn/go-isatty"
log "github.com/sirupsen/logrus"
"github.com/nektos/act/pkg/common"
"code.forgejo.org/forgejo/runner/act/common"
)
var (

2
act/common/git/git_test.go
View file

@ -13,7 +13,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/nektos/act/pkg/common"
"code.forgejo.org/forgejo/runner/act/common"
)
func TestFindGitSlug(t *testing.T) {

2
act/container/container_types.go
View file

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

2
act/container/docker_auth.go
View file

@ -6,10 +6,10 @@ import (
"context"
"strings"
"code.forgejo.org/forgejo/runner/act/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) {

2
act/container/docker_build.go
View file

@ -14,7 +14,7 @@ import (
"github.com/moby/patternmatcher"
"github.com/moby/patternmatcher/ignorefile"
"github.com/nektos/act/pkg/common"
"code.forgejo.org/forgejo/runner/act/common"
)
// NewDockerBuildExecutor function to create a run executor for the container

2
act/container/docker_network.go
View file

@ -5,8 +5,8 @@ package container
import (
"context"
"code.forgejo.org/forgejo/runner/act/common"
"github.com/docker/docker/api/types/network"
"github.com/nektos/act/pkg/common"
)
func NewDockerNetworkCreateExecutor(name string, config *network.CreateOptions) common.Executor {

2
act/container/docker_pull.go
View file

@ -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"
"code.forgejo.org/forgejo/runner/act/common"
)
// NewDockerPullExecutor function to create a run executor for the container

4
act/container/docker_run.go
View file

@ -37,8 +37,8 @@ import (
"github.com/spf13/pflag"
"golang.org/x/term"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/filecollector"
"code.forgejo.org/forgejo/runner/act/common"
"code.forgejo.org/forgejo/runner/act/filecollector"
)
// NewContainer creates a reference to a container

2
act/container/docker_run_test.go
View file

@ -11,7 +11,7 @@ import (
"testing"
"time"
"github.com/nektos/act/pkg/common"
"code.forgejo.org/forgejo/runner/act/common"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container"

2
act/container/docker_stub.go
View file

@ -6,9 +6,9 @@ import (
"context"
"runtime"
"code.forgejo.org/forgejo/runner/act/common"
"github.com/docker/docker/api/types/network"
"github.com/docker/docker/api/types/system"
"github.com/nektos/act/pkg/common"
"github.com/pkg/errors"
)

2
act/container/docker_volume.go
View file

@ -5,9 +5,9 @@ package container
import (
"context"
"code.forgejo.org/forgejo/runner/act/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 {

6
act/container/host_environment.go
View file

@ -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"
"code.forgejo.org/forgejo/runner/act/common"
"code.forgejo.org/forgejo/runner/act/filecollector"
"code.forgejo.org/forgejo/runner/act/lookpath"
)
type HostEnvironment struct {

2
act/container/parse_env_file.go
View file

@ -8,7 +8,7 @@ import (
"io"
"strings"
"github.com/nektos/act/pkg/common"
"code.forgejo.org/forgejo/runner/act/common"
)
func parseEnvFile(e Container, srcPath string, env *map[string]string) common.Executor {

2
act/exprparser/functions.go
View file

@ -15,7 +15,7 @@ import (
"github.com/go-git/go-git/v5/plumbing/format/gitignore"
"github.com/nektos/act/pkg/model"
"code.forgejo.org/forgejo/runner/act/model"
"github.com/rhysd/actionlint"
)

2
act/exprparser/functions_test.go
View file

@ -4,7 +4,7 @@ import (
"path/filepath"
"testing"
"github.com/nektos/act/pkg/model"
"code.forgejo.org/forgejo/runner/act/model"
"github.com/stretchr/testify/assert"
)

2
act/exprparser/interpreter.go
View file

@ -7,7 +7,7 @@ import (
"reflect"
"strings"
"github.com/nektos/act/pkg/model"
"code.forgejo.org/forgejo/runner/act/model"
"github.com/rhysd/actionlint"
)

2
act/exprparser/interpreter_test.go
View file

@ -4,7 +4,7 @@ import (
"math"
"testing"
"github.com/nektos/act/pkg/model"
"code.forgejo.org/forgejo/runner/act/model"
"github.com/stretchr/testify/assert"
)

2
act/jobparser/evaluator.go
View file

@ -5,7 +5,7 @@ import (
"regexp"
"strings"
"github.com/nektos/act/pkg/exprparser"
"code.forgejo.org/forgejo/runner/act/exprparser"
"gopkg.in/yaml.v3"
)

4
act/jobparser/interpeter.go
View file

@ -1,8 +1,8 @@
package jobparser
import (
"github.com/nektos/act/pkg/exprparser"
"github.com/nektos/act/pkg/model"
"code.forgejo.org/forgejo/runner/act/exprparser"
"code.forgejo.org/forgejo/runner/act/model"
"gopkg.in/yaml.v3"
)

2
act/jobparser/jobparser.go
View file

@ -8,7 +8,7 @@ import (
"gopkg.in/yaml.v3"
"github.com/nektos/act/pkg/model"
"code.forgejo.org/forgejo/runner/act/model"
)
func Parse(content []byte, validate bool, options ...ParseOption) ([]*SingleWorkflow, error) {

2
act/jobparser/model.go
View file

@ -3,7 +3,7 @@ package jobparser
import (
"fmt"
"github.com/nektos/act/pkg/model"
"code.forgejo.org/forgejo/runner/act/model"
"gopkg.in/yaml.v3"
)

2
act/jobparser/model_test.go
View file

@ -5,7 +5,7 @@ import (
"strings"
"testing"
"github.com/nektos/act/pkg/model"
"code.forgejo.org/forgejo/runner/act/model"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

2
act/jobparser/testdata_test.go
View file

@ -6,7 +6,7 @@ import (
"path/filepath"
"testing"
"github.com/nektos/act/pkg/model"
"code.forgejo.org/forgejo/runner/act/model"
"github.com/stretchr/testify/require"
)

2
act/model/action.go
View file

@ -5,7 +5,7 @@ import (
"io"
"strings"
"github.com/nektos/act/pkg/schema"
"code.forgejo.org/forgejo/runner/act/schema"
"gopkg.in/yaml.v3"
)

4
act/model/github_context.go
View file

@ -5,8 +5,8 @@ import (
"fmt"
"strings"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/common/git"
"code.forgejo.org/forgejo/runner/act/common"
"code.forgejo.org/forgejo/runner/act/common/git"
)
type GithubContext struct {

4
act/model/workflow.go
View file

@ -10,8 +10,8 @@ import (
"strconv"
"strings"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/schema"
"code.forgejo.org/forgejo/runner/act/common"
"code.forgejo.org/forgejo/runner/act/schema"
log "github.com/sirupsen/logrus"
"gopkg.in/yaml.v3"
)

6
act/runner/action.go
View file

@ -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"
"code.forgejo.org/forgejo/runner/act/common"
"code.forgejo.org/forgejo/runner/act/container"
"code.forgejo.org/forgejo/runner/act/model"
)
type actionStep interface {

2
act/runner/action_cache.go
View file

@ -18,7 +18,7 @@ import (
"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"
"code.forgejo.org/forgejo/runner/act/common"
)
type ActionCache interface {

4
act/runner/action_composite.go
View file

@ -6,8 +6,8 @@ import (
"regexp"
"strings"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/model"
"code.forgejo.org/forgejo/runner/act/common"
"code.forgejo.org/forgejo/runner/act/model"
)
func evaluateCompositeInputAndEnv(ctx context.Context, parent *RunContext, step actionStep) map[string]string {

2
act/runner/action_test.go
View file

@ -7,7 +7,7 @@ import (
"strings"
"testing"
"github.com/nektos/act/pkg/model"
"code.forgejo.org/forgejo/runner/act/model"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)

2
act/runner/command.go
View file

@ -5,7 +5,7 @@ import (
"regexp"
"strings"
"github.com/nektos/act/pkg/common"
"code.forgejo.org/forgejo/runner/act/common"
)
var (

4
act/runner/command_test.go
View file

@ -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"
"code.forgejo.org/forgejo/runner/act/common"
"code.forgejo.org/forgejo/runner/act/model"
)
func TestCommandSetEnv(t *testing.T) {

4
act/runner/container_mock_test.go
View file

@ -4,8 +4,8 @@ import (
"context"
"io"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/container"
"code.forgejo.org/forgejo/runner/act/common"
"code.forgejo.org/forgejo/runner/act/container"
"github.com/stretchr/testify/mock"
)

8
act/runner/expression.go
View file

@ -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"
"code.forgejo.org/forgejo/runner/act/common"
"code.forgejo.org/forgejo/runner/act/container"
"code.forgejo.org/forgejo/runner/act/exprparser"
"code.forgejo.org/forgejo/runner/act/model"
"gopkg.in/yaml.v3"
)

4
act/runner/expression_test.go
View file

@ -4,8 +4,8 @@ import (
"context"
"testing"
"github.com/nektos/act/pkg/exprparser"
"github.com/nektos/act/pkg/model"
"code.forgejo.org/forgejo/runner/act/exprparser"
"code.forgejo.org/forgejo/runner/act/model"
assert "github.com/stretchr/testify/assert"
yaml "gopkg.in/yaml.v3"
)

6
act/runner/job_executor.go
View file

@ -5,9 +5,9 @@ import (
"fmt"
"time"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/container"
"github.com/nektos/act/pkg/model"
"code.forgejo.org/forgejo/runner/act/common"
"code.forgejo.org/forgejo/runner/act/container"
"code.forgejo.org/forgejo/runner/act/model"
)
type jobInfo interface {

6
act/runner/job_executor_test.go
View file

@ -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"
"code.forgejo.org/forgejo/runner/act/common"
"code.forgejo.org/forgejo/runner/act/container"
"code.forgejo.org/forgejo/runner/act/model"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)

2
act/runner/local_repository_cache.go
View file

@ -12,7 +12,7 @@ import (
"path/filepath"
"strings"
"github.com/nektos/act/pkg/filecollector"
"code.forgejo.org/forgejo/runner/act/filecollector"
)
type LocalRepositoryCache struct {

2
act/runner/logger.go
View file

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

6
act/runner/reusable_workflow.go
View file

@ -12,9 +12,9 @@ import (
"strings"
"sync"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/common/git"
"github.com/nektos/act/pkg/model"
"code.forgejo.org/forgejo/runner/act/common"
"code.forgejo.org/forgejo/runner/act/common/git"
"code.forgejo.org/forgejo/runner/act/model"
)
func newLocalReusableWorkflowExecutor(rc *RunContext) common.Executor {

8
act/runner/run_context.go
View file

@ -20,12 +20,12 @@ import (
"text/template"
"time"
"code.forgejo.org/forgejo/runner/act/common"
"code.forgejo.org/forgejo/runner/act/container"
"code.forgejo.org/forgejo/runner/act/exprparser"
"code.forgejo.org/forgejo/runner/act/model"
"github.com/docker/docker/api/types/network"
"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"
)

10
act/runner/run_context_test.go
View file

@ -10,10 +10,10 @@ import (
"strings"
"testing"
"github.com/nektos/act/pkg/container"
"github.com/nektos/act/pkg/exprparser"
"github.com/nektos/act/pkg/model"
"github.com/nektos/act/pkg/testutils"
"code.forgejo.org/forgejo/runner/act/container"
"code.forgejo.org/forgejo/runner/act/exprparser"
"code.forgejo.org/forgejo/runner/act/model"
"code.forgejo.org/forgejo/runner/act/testutils"
"github.com/docker/go-connections/nat"
log "github.com/sirupsen/logrus"
@ -318,7 +318,7 @@ func TestRunContext_GetGitHubContext(t *testing.T) {
actor = a
}
repo := "forgejo/act"
repo := "forgejo/runner"
if r := os.Getenv("ACT_REPOSITORY"); r != "" {
repo = r
}

4
act/runner/runner.go
View file

@ -11,8 +11,8 @@ import (
docker_container "github.com/docker/docker/api/types/container"
log "github.com/sirupsen/logrus"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/model"
"code.forgejo.org/forgejo/runner/act/common"
"code.forgejo.org/forgejo/runner/act/model"
)
// Runner provides capabilities to run GitHub actions

4
act/runner/runner_test.go
View file

@ -16,8 +16,8 @@ import (
assert "github.com/stretchr/testify/assert"
"gopkg.in/yaml.v3"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/model"
"code.forgejo.org/forgejo/runner/act/common"
"code.forgejo.org/forgejo/runner/act/model"
)
var (

8
act/runner/step.go
View file

@ -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"
"code.forgejo.org/forgejo/runner/act/common"
"code.forgejo.org/forgejo/runner/act/container"
"code.forgejo.org/forgejo/runner/act/exprparser"
"code.forgejo.org/forgejo/runner/act/model"
)
type step interface {

4
act/runner/step_action_local.go
View file

@ -11,8 +11,8 @@ import (
"path"
"path/filepath"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/model"
"code.forgejo.org/forgejo/runner/act/common"
"code.forgejo.org/forgejo/runner/act/model"
)
type stepActionLocal struct {

6
act/runner/step_action_local_test.go
View file

@ -8,8 +8,8 @@ import (
"strings"
"testing"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/model"
"code.forgejo.org/forgejo/runner/act/common"
"code.forgejo.org/forgejo/runner/act/model"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"gopkg.in/yaml.v3"
@ -262,7 +262,7 @@ func TestStepActionLocalPost(t *testing.T) {
return strings.HasSuffix(array[1], suffix)
})
}
cm.On("Exec", suffixMatcher("pkg/runner/local/action/post.js"), sal.env, "", "").Return(func(ctx context.Context) error { return tt.err })
cm.On("Exec", suffixMatcher("act/runner/local/action/post.js"), sal.env, "", "").Return(func(ctx context.Context) error { return tt.err })
cm.On("Copy", "/var/run/act", mock.AnythingOfType("[]*container.FileEntry")).Return(func(ctx context.Context) error {
return nil

6
act/runner/step_action_remote.go
View file

@ -14,9 +14,9 @@ import (
gogit "github.com/go-git/go-git/v5"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/common/git"
"github.com/nektos/act/pkg/model"
"code.forgejo.org/forgejo/runner/act/common"
"code.forgejo.org/forgejo/runner/act/common/git"
"code.forgejo.org/forgejo/runner/act/model"
)
type stepActionRemote struct {

6
act/runner/step_action_remote_test.go
View file

@ -11,9 +11,9 @@ import (
"github.com/stretchr/testify/mock"
"gopkg.in/yaml.v3"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/common/git"
"github.com/nektos/act/pkg/model"
"code.forgejo.org/forgejo/runner/act/common"
"code.forgejo.org/forgejo/runner/act/common/git"
"code.forgejo.org/forgejo/runner/act/model"
)
type stepActionRemoteMocks struct {

6
act/runner/step_docker.go
View file

@ -5,10 +5,10 @@ import (
"fmt"
"strings"
"code.forgejo.org/forgejo/runner/act/common"
"code.forgejo.org/forgejo/runner/act/container"
"code.forgejo.org/forgejo/runner/act/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 {

4
act/runner/step_docker_test.go
View file

@ -6,8 +6,8 @@ import (
"io"
"testing"
"github.com/nektos/act/pkg/container"
"github.com/nektos/act/pkg/model"
"code.forgejo.org/forgejo/runner/act/container"
"code.forgejo.org/forgejo/runner/act/model"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)

2
act/runner/step_factory.go
View file

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

2
act/runner/step_factory_test.go
View file

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

8
act/runner/step_run.go
View file

@ -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"
"code.forgejo.org/forgejo/runner/act/common"
"code.forgejo.org/forgejo/runner/act/container"
"code.forgejo.org/forgejo/runner/act/lookpath"
"code.forgejo.org/forgejo/runner/act/model"
)
type stepRun struct {

4
act/runner/step_run_test.go
View file

@ -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"
"code.forgejo.org/forgejo/runner/act/container"
"code.forgejo.org/forgejo/runner/act/model"
)
func TestStepRun(t *testing.T) {

4
act/runner/step_test.go
View file

@ -4,8 +4,8 @@ import (
"context"
"testing"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/model"
"code.forgejo.org/forgejo/runner/act/common"
"code.forgejo.org/forgejo/runner/act/model"
log "github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"

47
go.mod
View file

@ -7,15 +7,35 @@ toolchain go1.23.11
require (
code.forgejo.org/forgejo/actions-proto v0.5.1
connectrpc.com/connect v1.18.1
github.com/Masterminds/semver v1.5.0
github.com/avast/retry-go/v4 v4.6.1
github.com/containerd/errdefs v0.3.0
github.com/creack/pty v1.1.24
github.com/distribution/reference v0.6.0
github.com/docker/cli v28.2.2+incompatible
github.com/docker/docker v28.3.2+incompatible
github.com/docker/go-connections v0.5.0
github.com/go-git/go-billy/v5 v5.6.1
github.com/go-git/go-git/v5 v5.13.1
github.com/gobwas/glob v0.2.3
github.com/google/uuid v1.6.0
github.com/imdario/mergo v0.3.16
github.com/joho/godotenv v1.5.1
github.com/julienschmidt/httprouter v1.3.0
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
github.com/mattn/go-isatty v0.0.20
github.com/nektos/act v0.2.49
github.com/moby/go-archive v0.1.0
github.com/moby/patternmatcher v0.6.0
github.com/opencontainers/image-spec v1.1.0
github.com/opencontainers/selinux v1.11.0
github.com/pkg/errors v0.9.1
github.com/rhysd/actionlint v1.6.27
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.9.1
github.com/spf13/pflag v1.0.6
github.com/stretchr/testify v1.10.0
github.com/timshannon/bolthold v0.0.0-20240314194003-30aac6950928
go.etcd.io/bbolt v1.3.10
golang.org/x/term v0.33.0
golang.org/x/time v0.12.0
google.golang.org/protobuf v1.36.6
@ -26,71 +46,51 @@ require (
require (
dario.cat/mergo v1.0.0 // indirect
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
github.com/Masterminds/semver v1.5.0 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/ProtonMail/go-crypto v1.1.3 // indirect
github.com/cloudflare/circl v1.6.1 // indirect
github.com/containerd/errdefs v0.3.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/cyphar/filepath-securejoin v0.3.6 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/cli v28.2.2+incompatible // indirect
github.com/docker/docker-credential-helpers v0.8.0 // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/fatih/color v1.16.0 // 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.6.1 // indirect
github.com/go-git/go-git/v5 v5.13.1 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-viper/mapstructure/v2 v2.3.0 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/imdario/mergo v0.3.16 // 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.2.0 // indirect
github.com/klauspost/compress v1.18.0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-runewidth v0.0.15 // 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/atomicwriter v0.1.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.0 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0 // indirect
github.com/opencontainers/selinux v1.11.0 // indirect
github.com/pjbgf/sha1cd v0.3.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rhysd/actionlint v1.6.27 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/robfig/cron/v3 v3.0.1 // indirect
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
github.com/skeema/knownhosts v1.3.0 // indirect
github.com/spf13/pflag v1.0.6 // indirect
github.com/stretchr/objx v0.5.2 // 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.3.10 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
go.opentelemetry.io/otel v1.36.0 // indirect
@ -102,7 +102,6 @@ require (
golang.org/x/net v0.38.0 // indirect
golang.org/x/sync v0.12.0 // indirect
golang.org/x/sys v0.34.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
)
replace github.com/nektos/act => code.forgejo.org/forgejo/act v1.37.0

3
go.sum
View file

@ -1,5 +1,3 @@
code.forgejo.org/forgejo/act v1.37.0 h1:cy6VSQAZGDs6Pl2MNTygPGTPKMAX2+m1or4krJfzjTQ=
code.forgejo.org/forgejo/act v1.37.0/go.mod h1:WkmxVBteC4zoyQGYp8ZFZY7Xb+jat+b7ChvqW6TxqF8=
code.forgejo.org/forgejo/actions-proto v0.5.1 h1:GCJHR/Y/Apk7Yl7CH9qOsKrdf/k0tRVFeVhz1EIZvb4=
code.forgejo.org/forgejo/actions-proto v0.5.1/go.mod h1:nu8N1HQLsu3c4T/PpYWbqwNBxsZnEOVxqV0mQWtIQvE=
connectrpc.com/connect v1.18.1 h1:PAg7CjSAGvscaf6YZKUefjoih5Z/qYkyaTrBW8xvYPw=
@ -282,6 +280,7 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 h1:wpZ8pe2x1Q3f2KyT5f8oP/fa9rHAKgFPr/HZdNuS+PQ=
google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f h1:2yNACc1O40tTnrsbk9Cv6oxiW8pxI/pXj0wRtdlYmgY=
google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f/go.mod h1:Uy9bTZJqmfrw2rIBxgGLnamc78euZULUBrLZ9XTITKI=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ=

2
internal/app/cmd/cache-server.go
View file

@ -11,7 +11,7 @@ import (
"code.forgejo.org/forgejo/runner/internal/pkg/config"
"github.com/nektos/act/pkg/artifactcache"
"code.forgejo.org/forgejo/runner/act/artifactcache"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)

8
internal/app/cmd/exec.go
View file

@ -13,12 +13,12 @@ import (
"strings"
"time"
"code.forgejo.org/forgejo/runner/act/artifactcache"
"code.forgejo.org/forgejo/runner/act/common"
"code.forgejo.org/forgejo/runner/act/model"
"code.forgejo.org/forgejo/runner/act/runner"
"github.com/docker/docker/api/types/container"
"github.com/joho/godotenv"
"github.com/nektos/act/pkg/artifactcache"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/model"
"github.com/nektos/act/pkg/runner"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"golang.org/x/term"

10
internal/app/run/runner.go
View file

@ -16,13 +16,13 @@ import (
"time"
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1"
"code.forgejo.org/forgejo/runner/act/artifactcache"
"code.forgejo.org/forgejo/runner/act/cacheproxy"
"code.forgejo.org/forgejo/runner/act/common"
"code.forgejo.org/forgejo/runner/act/model"
"code.forgejo.org/forgejo/runner/act/runner"
"connectrpc.com/connect"
"github.com/docker/docker/api/types/container"
"github.com/nektos/act/pkg/artifactcache"
"github.com/nektos/act/pkg/cacheproxy"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/model"
"github.com/nektos/act/pkg/runner"
log "github.com/sirupsen/logrus"
"code.forgejo.org/forgejo/runner/internal/pkg/client"

2
internal/app/run/workflow.go
View file

@ -10,7 +10,7 @@ import (
"strings"
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1"
"github.com/nektos/act/pkg/model"
"code.forgejo.org/forgejo/runner/act/model"
"gopkg.in/yaml.v3"
)

2
internal/app/run/workflow_test.go
View file

@ -7,7 +7,7 @@ import (
"testing"
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1"
"github.com/nektos/act/pkg/model"
"code.forgejo.org/forgejo/runner/act/model"
"github.com/stretchr/testify/require"
"gotest.tools/v3/assert"
)

9
renovate.json
View file

@ -4,9 +4,14 @@
"prConcurrentLimit": 1,
"packageRules": [
{
"description": "Disable nektos/act, it's replaced",
"matchDepNames": ["github.com/nektos/act"],
"description": "Disable act test data",
"matchFileNames": ["act/*/testdata/**"],
"enabled": false
},
{
"description": "Separate minor and patch for some packages",
"matchDepNames": ["github.com/rhysd/actionlint"],
"separateMinorPatch": true
}
],
"ignorePaths": []