Skip to content

Commit 97211bf

Browse files
silverwindclaudeCopilot
authored
refactor(deps): migrate from nektos/act fork to gitea/runner (go-gitea#37557)
Migrate to https://gitea.com/gitea/runner/releases/tag/v1.0.0 which includes the `act` package directory previously referenced by `nektos/act`. Signed-off-by: silverwind <me@silverwind.io> Co-authored-by: Claude (Opus 4.7) <noreply@anthropic.com> Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
1 parent 45ffe5a commit 97211bf

22 files changed

Lines changed: 37 additions & 33 deletions

File tree

assets/go-licenses.json

Lines changed: 10 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ require (
1212
code.gitea.io/sdk/gitea v0.24.1
1313
codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570
1414
connectrpc.com/connect v1.19.2
15+
gitea.com/gitea/runner v1.0.0
1516
gitea.com/go-chi/binding v0.0.0-20260414111559-654cea7ac60a
1617
gitea.com/go-chi/cache v0.2.1
1718
gitea.com/go-chi/captcha v0.0.0-20240315150714-fb487f629098
@@ -85,7 +86,6 @@ require (
8586
github.com/microsoft/go-mssqldb v1.9.6
8687
github.com/minio/minio-go/v7 v7.1.0
8788
github.com/msteinert/pam/v2 v2.1.0
88-
github.com/nektos/act v0.2.63
8989
github.com/niklasfasching/go-org v1.9.1
9090
github.com/opencontainers/go-digest v1.0.0
9191
github.com/opencontainers/image-spec v1.1.1
@@ -301,8 +301,6 @@ ignore (
301301

302302
replace github.com/jaytaylor/html2text => github.com/Necoro/html2text v0.0.0-20250804200300-7bf1ce1c7347 // jaytaylor/html2text is unmaintained
303303

304-
replace github.com/nektos/act => gitea.com/gitea/act v0.261.10 // gitea maintains its own package
305-
306304
replace github.com/urfave/cli/v3 => github.com/urfave/cli/v3 v3.4.1 // v3.6.2 breaks -c flag parsing in help commands
307305

308306
replace go.yaml.in/yaml/v4 => go.yaml.in/yaml/v4 v4.0.0-rc.3 // rc.4 changes block scalar serialization, wait for stable release

go.sum

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8=
1414
dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA=
1515
filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo=
1616
filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc=
17-
gitea.com/gitea/act v0.261.10 h1:ndwbtuMXXz1dpYF2iwY1/PkgKNETo4jmPXfinTZt8cs=
18-
gitea.com/gitea/act v0.261.10/go.mod h1:oIkqQHvU0lfuIWwcpqa4FmU+t3prA89tgkuHUTsrI2c=
17+
gitea.com/gitea/runner v1.0.0 h1:s3AS5u8r+B5W+Gy69sYYvCVTb0f23fRM6H+CbrFrobE=
18+
gitea.com/gitea/runner v1.0.0/go.mod h1:bn+8Qt3KyvdVQHD3OR2yRoKgEXs8dXqwBVtmfYVrNIE=
1919
gitea.com/go-chi/binding v0.0.0-20260414111559-654cea7ac60a h1:JHoBrfuTSF9Ke9aNfSYj1XRPBHjKPgCApVprnt2Am0M=
2020
gitea.com/go-chi/binding v0.0.0-20260414111559-654cea7ac60a/go.mod h1:FOsLJIMdpiHzBp3Vby6Wfkdw2ppGscrjgU1IC7E4/zQ=
2121
gitea.com/go-chi/cache v0.2.1 h1:bfAPkvXlbcZxPCpcmDVCWoHgiBSBmZN/QosnZvEC0+g=
@@ -686,8 +686,9 @@ github.com/steveyen/gtreap v0.1.0/go.mod h1:kl/5J7XbrOmlIbYIXdRHDDE5QxHqpk0cmkT7
686686
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
687687
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
688688
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
689-
github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
690689
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
690+
github.com/stretchr/objx v0.5.3 h1:jmXUvGomnU1o3W/V5h2VEradbpJDwGrzugQQvL0POH4=
691+
github.com/stretchr/objx v0.5.3/go.mod h1:rDQraq+vQZU7Fde9LOZLr8Tax6zZvy4kuNKF+QYS+U0=
691692
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
692693
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
693694
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=

models/actions/artifact.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 2023 The Gitea Authors. All rights reserved.
22
// SPDX-License-Identifier: MIT
33

4-
// This artifact server is inspired by https://github.com/nektos/act/blob/master/pkg/artifacts/server.go.
4+
// This artifact server is inspired by the Gitea runner artifact server implementation.
55
// It updates url setting and uses ObjectStore to handle artifacts persistence.
66

77
package actions

modules/actions/jobparser/evaluator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"regexp"
1010
"strings"
1111

12-
"github.com/nektos/act/pkg/exprparser"
12+
"gitea.com/gitea/runner/act/exprparser"
1313
"go.yaml.in/yaml/v4"
1414
)
1515

modules/actions/jobparser/interpeter.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
package jobparser
55

66
import (
7-
"github.com/nektos/act/pkg/exprparser"
8-
"github.com/nektos/act/pkg/model"
7+
"gitea.com/gitea/runner/act/exprparser"
8+
"gitea.com/gitea/runner/act/model"
99
"go.yaml.in/yaml/v4"
1010
)
1111

modules/actions/jobparser/jobparser.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"sort"
1010
"strings"
1111

12-
"github.com/nektos/act/pkg/exprparser"
13-
"github.com/nektos/act/pkg/model"
12+
"gitea.com/gitea/runner/act/exprparser"
13+
"gitea.com/gitea/runner/act/model"
1414
"go.yaml.in/yaml/v4"
1515
)
1616

modules/actions/jobparser/model.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"errors"
99
"fmt"
1010

11-
"github.com/nektos/act/pkg/model"
11+
"gitea.com/gitea/runner/act/model"
1212
"go.yaml.in/yaml/v4"
1313
)
1414

modules/actions/jobparser/model_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"strings"
88
"testing"
99

10-
"github.com/nektos/act/pkg/model"
10+
"gitea.com/gitea/runner/act/model"
1111
"github.com/stretchr/testify/assert"
1212
"github.com/stretchr/testify/require"
1313
"go.yaml.in/yaml/v4"

modules/actions/workflows.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import (
1717
"code.gitea.io/gitea/modules/util"
1818
webhook_module "code.gitea.io/gitea/modules/webhook"
1919

20-
"github.com/nektos/act/pkg/model"
21-
"github.com/nektos/act/pkg/workflowpattern"
20+
"gitea.com/gitea/runner/act/model"
21+
"gitea.com/gitea/runner/act/workflowpattern"
2222
"go.yaml.in/yaml/v4"
2323
)
2424

0 commit comments

Comments
 (0)