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: s|gitea.com/gitea/act_runner|runner.forgejo.org|

Browse source
This commit is contained in:
Earl Warren 2025-07-03 19:01:33 +02:00
parent 8cb450ffe0
commit eb1becd4b8
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
22 changed files with 52 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.github/workflows/build-release.yml vendored
View file

@ -25,7 +25,7 @@ jobs:
run: |
env GOOS=windows GOARCH=${{matrix.architecture}} \
go build \
-ldflags "-s -w -X gitea.com/gitea/act_runner/internal/pkg/ver.version=${{ github.ref_name }}" \
-ldflags "-s -w -X runner.forgejo.org/internal/pkg/ver.version=${{ github.ref_name }}" \
-o forgejo-runner-windows-${{matrix.architecture}}.exe
- uses: actions/upload-artifact@v4
@ -149,4 +149,3 @@ jobs:
token: ${{ secrets.RELEASE_TOKEN }}
fail_on_unmatched_files: true
body: See [original release notes](https://code.forgejo.org/forgejo/runner/releases/tag/${{ github.ref_name }}).

4
Makefile
View file

@ -61,11 +61,11 @@ else
endif
endif
GO_PACKAGES_TO_VET ?= $(filter-out gitea.com/gitea/act_runner/internal/pkg/client/mocks,$(shell $(GO) list ./...))
GO_PACKAGES_TO_VET ?= $(filter-out runner.forgejo.org/internal/pkg/client/mocks,$(shell $(GO) list ./...))
TAGS ?=
LDFLAGS ?= -X "gitea.com/gitea/act_runner/internal/pkg/ver.version=v$(RELEASE_VERSION)"
LDFLAGS ?= -X "runner.forgejo.org/internal/pkg/ver.version=v$(RELEASE_VERSION)"
all: build

4
go.mod
View file

@ -1,4 +1,4 @@
module gitea.com/gitea/act_runner
module runner.forgejo.org
go 1.23.0
@ -6,7 +6,6 @@ toolchain go1.23.10
require (
code.forgejo.org/forgejo/actions-proto v0.5.1
code.gitea.io/gitea-vet v0.2.3
connectrpc.com/connect v1.18.1
github.com/avast/retry-go/v4 v4.6.1
github.com/docker/docker v28.3.0+incompatible
@ -100,7 +99,6 @@ require (
golang.org/x/net v0.38.0 // indirect
golang.org/x/sync v0.12.0 // indirect
golang.org/x/sys v0.33.0 // indirect
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
)

8
go.sum
View file

@ -2,8 +2,6 @@ code.forgejo.org/forgejo/act v1.28.0 h1:96njNC7C1YNyjWq5OWvLZMF/nw0PMthzIA8Nwbnn
code.forgejo.org/forgejo/act v1.28.0/go.mod h1:dFuiwAmD5vyrzecysHB2kL/GM3wRpoVPl+WdbCTC8Bs=
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=
code.gitea.io/gitea-vet v0.2.3 h1:gdFmm6WOTM65rE8FUBTRzeQZYzXePKSSB1+r574hWwI=
code.gitea.io/gitea-vet v0.2.3/go.mod h1:zcNbT/aJEmivCAhfmkHOlT645KNOf9W2KnkLgFjGGfE=
connectrpc.com/connect v1.18.1 h1:PAg7CjSAGvscaf6YZKUefjoih5Z/qYkyaTrBW8xvYPw=
connectrpc.com/connect v1.18.1/go.mod h1:0292hj1rnx8oFrStN7cB4jjVBeqs+Yx5yDIC2prWDO8=
dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
@ -206,7 +204,6 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHo
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
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.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
go.etcd.io/bbolt v1.3.8/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
@ -241,8 +238,6 @@ golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
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=
@ -283,11 +278,8 @@ golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
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.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
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=

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

@ -9,7 +9,7 @@ import (
"os"
"os/signal"
"gitea.com/gitea/act_runner/internal/pkg/config"
"runner.forgejo.org/internal/pkg/config"
"github.com/nektos/act/pkg/artifactcache"
log "github.com/sirupsen/logrus"

4
internal/app/cmd/cmd.go
View file

@ -10,8 +10,8 @@ import (
"github.com/spf13/cobra"
"gitea.com/gitea/act_runner/internal/pkg/config"
"gitea.com/gitea/act_runner/internal/pkg/ver"
"runner.forgejo.org/internal/pkg/config"
"runner.forgejo.org/internal/pkg/ver"
)
func Execute(ctx context.Context) {

8
internal/app/cmd/create-runner-file.go
View file

@ -14,10 +14,10 @@ import (
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"gitea.com/gitea/act_runner/internal/app/run"
"gitea.com/gitea/act_runner/internal/pkg/client"
"gitea.com/gitea/act_runner/internal/pkg/config"
"gitea.com/gitea/act_runner/internal/pkg/ver"
"runner.forgejo.org/internal/app/run"
"runner.forgejo.org/internal/pkg/client"
"runner.forgejo.org/internal/pkg/config"
"runner.forgejo.org/internal/pkg/ver"
)
type createRunnerFileArgs struct {

6
internal/app/cmd/create-runner-file_test.go
View file

@ -10,9 +10,9 @@ import (
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1"
"connectrpc.com/connect"
"gitea.com/gitea/act_runner/internal/pkg/client"
"gitea.com/gitea/act_runner/internal/pkg/config"
"gitea.com/gitea/act_runner/internal/pkg/ver"
"runner.forgejo.org/internal/pkg/client"
"runner.forgejo.org/internal/pkg/config"
"runner.forgejo.org/internal/pkg/ver"
"github.com/spf13/cobra"
"github.com/stretchr/testify/assert"

14
internal/app/cmd/daemon.go
View file

@ -18,13 +18,13 @@ import (
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"gitea.com/gitea/act_runner/internal/app/poll"
"gitea.com/gitea/act_runner/internal/app/run"
"gitea.com/gitea/act_runner/internal/pkg/client"
"gitea.com/gitea/act_runner/internal/pkg/config"
"gitea.com/gitea/act_runner/internal/pkg/envcheck"
"gitea.com/gitea/act_runner/internal/pkg/labels"
"gitea.com/gitea/act_runner/internal/pkg/ver"
"runner.forgejo.org/internal/app/poll"
"runner.forgejo.org/internal/app/run"
"runner.forgejo.org/internal/pkg/client"
"runner.forgejo.org/internal/pkg/config"
"runner.forgejo.org/internal/pkg/envcheck"
"runner.forgejo.org/internal/pkg/labels"
"runner.forgejo.org/internal/pkg/ver"
)
func runDaemon(ctx context.Context, configFile *string) func(cmd *cobra.Command, args []string) error {

14
internal/app/cmd/job.go
View file

@ -13,13 +13,13 @@ import (
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"gitea.com/gitea/act_runner/internal/app/job"
"gitea.com/gitea/act_runner/internal/app/run"
"gitea.com/gitea/act_runner/internal/pkg/client"
"gitea.com/gitea/act_runner/internal/pkg/config"
"gitea.com/gitea/act_runner/internal/pkg/envcheck"
"gitea.com/gitea/act_runner/internal/pkg/labels"
"gitea.com/gitea/act_runner/internal/pkg/ver"
"runner.forgejo.org/internal/app/job"
"runner.forgejo.org/internal/app/run"
"runner.forgejo.org/internal/pkg/client"
"runner.forgejo.org/internal/pkg/config"
"runner.forgejo.org/internal/pkg/envcheck"
"runner.forgejo.org/internal/pkg/labels"
"runner.forgejo.org/internal/pkg/ver"
)
func runJob(ctx context.Context, configFile *string) func(cmd *cobra.Command, args []string) error {

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

@ -20,10 +20,10 @@ import (
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"gitea.com/gitea/act_runner/internal/pkg/client"
"gitea.com/gitea/act_runner/internal/pkg/config"
"gitea.com/gitea/act_runner/internal/pkg/labels"
"gitea.com/gitea/act_runner/internal/pkg/ver"
"runner.forgejo.org/internal/pkg/client"
"runner.forgejo.org/internal/pkg/config"
"runner.forgejo.org/internal/pkg/labels"
"runner.forgejo.org/internal/pkg/ver"
)
// runRegister registers a runner to the server

6
internal/app/job/job.go
View file

@ -13,9 +13,9 @@ import (
log "github.com/sirupsen/logrus"
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1"
"gitea.com/gitea/act_runner/internal/app/run"
"gitea.com/gitea/act_runner/internal/pkg/client"
"gitea.com/gitea/act_runner/internal/pkg/config"
"runner.forgejo.org/internal/app/run"
"runner.forgejo.org/internal/pkg/client"
"runner.forgejo.org/internal/pkg/config"
)
type Job struct {

2
internal/app/job/job_test.go
View file

@ -11,7 +11,7 @@ import (
"code.forgejo.org/forgejo/actions-proto/ping/v1/pingv1connect"
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1"
"code.forgejo.org/forgejo/actions-proto/runner/v1/runnerv1connect"
"gitea.com/gitea/act_runner/internal/pkg/config"
"runner.forgejo.org/internal/pkg/config"
log "github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"

6
internal/app/poll/poller.go
View file

@ -15,9 +15,9 @@ import (
log "github.com/sirupsen/logrus"
"golang.org/x/time/rate"
"gitea.com/gitea/act_runner/internal/app/run"
"gitea.com/gitea/act_runner/internal/pkg/client"
"gitea.com/gitea/act_runner/internal/pkg/config"
"runner.forgejo.org/internal/app/run"
"runner.forgejo.org/internal/pkg/client"
"runner.forgejo.org/internal/pkg/config"
)
const PollerID = "PollerID"

2
internal/app/poll/poller_test.go
View file

@ -14,7 +14,7 @@ import (
"code.forgejo.org/forgejo/actions-proto/ping/v1/pingv1connect"
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1"
"code.forgejo.org/forgejo/actions-proto/runner/v1/runnerv1connect"
"gitea.com/gitea/act_runner/internal/pkg/config"
"runner.forgejo.org/internal/pkg/config"
log "github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"

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

@ -25,11 +25,11 @@ import (
"github.com/nektos/act/pkg/runner"
log "github.com/sirupsen/logrus"
"gitea.com/gitea/act_runner/internal/pkg/client"
"gitea.com/gitea/act_runner/internal/pkg/config"
"gitea.com/gitea/act_runner/internal/pkg/labels"
"gitea.com/gitea/act_runner/internal/pkg/report"
"gitea.com/gitea/act_runner/internal/pkg/ver"
"runner.forgejo.org/internal/pkg/client"
"runner.forgejo.org/internal/pkg/config"
"runner.forgejo.org/internal/pkg/labels"
"runner.forgejo.org/internal/pkg/report"
"runner.forgejo.org/internal/pkg/ver"
)
// Runner runs the pipeline.

3
internal/app/run/runner_test.go
View file

@ -4,7 +4,8 @@ import (
"context"
"testing"
"gitea.com/gitea/act_runner/internal/pkg/labels"
"runner.forgejo.org/internal/pkg/labels"
"github.com/stretchr/testify/assert"
)

2
internal/pkg/client/backward.go
View file

@ -4,7 +4,7 @@
package client
import (
runnerv1 "code.gitea.io/actions-proto-go/runner/v1"
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1"
)
func BackwardCompatibleContext(task *runnerv1.Task, suffix string) string {

2
internal/pkg/report/reporter.go
View file

@ -18,7 +18,7 @@ import (
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/types/known/timestamppb"
"gitea.com/gitea/act_runner/internal/pkg/client"
"runner.forgejo.org/internal/pkg/client"
)
type Reporter struct {

2
internal/pkg/report/reporter_test.go
View file

@ -17,7 +17,7 @@ import (
"github.com/stretchr/testify/require"
"google.golang.org/protobuf/types/known/structpb"
"gitea.com/gitea/act_runner/internal/pkg/client/mocks"
"runner.forgejo.org/internal/pkg/client/mocks"
)
func TestReporter_parseLogRow(t *testing.T) {

2
internal/pkg/ver/version.go
View file

@ -3,7 +3,7 @@
package ver
// go build -ldflags "-X gitea.com/gitea/act_runner/internal/pkg/ver.version=1.2.3"
// go build -ldflags "-X runner.forgejo.org/internal/pkg/ver.version=1.2.3"
var version = "dev"
func Version() string {

2
main.go
View file

@ -8,7 +8,7 @@ import (
"os/signal"
"syscall"
"gitea.com/gitea/act_runner/internal/app/cmd"
"runner.forgejo.org/internal/app/cmd"
)
func main() {