oss/forgejo-runner
oss/forgejo-runner
1
0
Fork 0
mirror of https://code.forgejo.org/forgejo/runner.git synced 2025-07-27 17:28:35 +00:00
Code Wiki Activity

chore: upgrade to code.forgejo.org/forgejo/actions-proto (#655)

Browse source 
In replacement of code.gitea.io/actions-proto-go

- https://gitea.com/gitea/actions-proto-def and https://gitea.com/gitea/actions-proto-go were merged into https://code.forgejo.org/forgejo/actions-proto to facilitate maintenance
- the generated go code is different because the package name is different
    - f4285dfc28 shows they compare exactly identical before the name change
    - a3c95cb82f is the generated code right after the name change
- the cascading pull request further shows the protocol is compatible by running [end-to-end actions tests](https://code.forgejo.org/forgejo/end-to-end/src/branch/main/actions) that rely on it, using a runner binary built from [this pull request](https://code.forgejo.org/forgejo/end-to-end/actions/runs/3329/jobs/2#jobstep-4-640) `0296d988d65e66b8d8a7951d0d7d7f8c6cf78b44` matches `v0.0.1+576-g0296d98`
    - `time="2025-07-03T12:53:50Z" level=info msg="runner: runner, with version: v0.0.1+576-g0296d98, with labels: [docker], declared successfully" func="[func6]" file="[daemon.go:108]"`

A similar pull request will be sent to Forgejo once this one is merged (less risky environment)

Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/655
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
Co-authored-by: Earl Warren <contact@earl-warren.org>
Co-committed-by: Earl Warren <contact@earl-warren.org>
This commit is contained in:
Earl Warren 2025-07-03 16:55:53 +00:00 • committed by earl-warren
parent 310335e6ab
commit 44d9d4f453
No known key found for this signature in database
GPG key ID: F128CBE6AB3A7201
17 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
go.mod
View file

@ -5,7 +5,7 @@ go 1.23.0
toolchain go1.23.10
require (
code.gitea.io/actions-proto-go v0.4.1
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

4
go.sum
View file

@ -1,7 +1,7 @@
code.forgejo.org/forgejo/act v1.28.0 h1:96njNC7C1YNyjWq5OWvLZMF/nw0PMthzIA8Nwbnn7jo=
code.forgejo.org/forgejo/act v1.28.0/go.mod h1:dFuiwAmD5vyrzecysHB2kL/GM3wRpoVPl+WdbCTC8Bs=
code.gitea.io/actions-proto-go v0.4.1 h1:l0EYhjsgpUe/1VABo2eK7zcoNX2W44WOnb0MSLrKfls=
code.gitea.io/actions-proto-go v0.4.1/go.mod h1:mn7Wkqz6JbnTOHQpot3yDeHx+O5C9EGhMEE+htvHBas=
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=

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

@ -8,7 +8,7 @@ import (
"fmt"
"os"
pingv1 "code.gitea.io/actions-proto-go/ping/v1"
pingv1 "code.forgejo.org/forgejo/actions-proto/ping/v1"
"connectrpc.com/connect"
gouuid "github.com/google/uuid"
log "github.com/sirupsen/logrus"

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

@ -8,7 +8,7 @@ import (
"os"
"testing"
runnerv1 "code.gitea.io/actions-proto-go/runner/v1"
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"

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

@ -13,8 +13,8 @@ import (
"strings"
"time"
pingv1 "code.gitea.io/actions-proto-go/ping/v1"
runnerv1 "code.gitea.io/actions-proto-go/runner/v1"
pingv1 "code.forgejo.org/forgejo/actions-proto/ping/v1"
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1"
"connectrpc.com/connect"
"github.com/mattn/go-isatty"
log "github.com/sirupsen/logrus"

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

@ -12,7 +12,7 @@ import (
"connectrpc.com/connect"
log "github.com/sirupsen/logrus"
runnerv1 "code.gitea.io/actions-proto-go/runner/v1"
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"

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

@ -8,9 +8,9 @@ import (
"connectrpc.com/connect"
"code.gitea.io/actions-proto-go/ping/v1/pingv1connect"
runnerv1 "code.gitea.io/actions-proto-go/runner/v1"
"code.gitea.io/actions-proto-go/runner/v1/runnerv1connect"
"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"
log "github.com/sirupsen/logrus"

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

@ -10,7 +10,7 @@ import (
"sync"
"sync/atomic"
runnerv1 "code.gitea.io/actions-proto-go/runner/v1"
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1"
"connectrpc.com/connect"
log "github.com/sirupsen/logrus"
"golang.org/x/time/rate"

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

@ -11,9 +11,9 @@ import (
"connectrpc.com/connect"
"code.gitea.io/actions-proto-go/ping/v1/pingv1connect"
runnerv1 "code.gitea.io/actions-proto-go/runner/v1"
"code.gitea.io/actions-proto-go/runner/v1/runnerv1connect"
"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"
log "github.com/sirupsen/logrus"

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

@ -15,7 +15,7 @@ import (
"sync"
"time"
runnerv1 "code.gitea.io/actions-proto-go/runner/v1"
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1"
"connectrpc.com/connect"
"github.com/docker/docker/api/types/container"
"github.com/nektos/act/pkg/artifactcache"

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

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

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

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

4
internal/pkg/client/client.go
View file

@ -4,8 +4,8 @@
package client
import (
"code.gitea.io/actions-proto-go/ping/v1/pingv1connect"
"code.gitea.io/actions-proto-go/runner/v1/runnerv1connect"
"code.forgejo.org/forgejo/actions-proto/ping/v1/pingv1connect"
"code.forgejo.org/forgejo/actions-proto/runner/v1/runnerv1connect"
)
// A Client manages communication with the runner.

4
internal/pkg/client/http.go
View file

@ -9,8 +9,8 @@ import (
"net/http"
"strings"
"code.gitea.io/actions-proto-go/ping/v1/pingv1connect"
"code.gitea.io/actions-proto-go/runner/v1/runnerv1connect"
"code.forgejo.org/forgejo/actions-proto/ping/v1/pingv1connect"
"code.forgejo.org/forgejo/actions-proto/runner/v1/runnerv1connect"
"connectrpc.com/connect"
)

4
internal/pkg/client/mocks/Client.go
View file

@ -9,9 +9,9 @@ import (
mock "github.com/stretchr/testify/mock"
pingv1 "code.gitea.io/actions-proto-go/ping/v1"
pingv1 "code.forgejo.org/forgejo/actions-proto/ping/v1"
runnerv1 "code.gitea.io/actions-proto-go/runner/v1"
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1"
)
// Client is an autogenerated mock type for the Client type

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

@ -11,7 +11,7 @@ import (
"sync"
"time"
runnerv1 "code.gitea.io/actions-proto-go/runner/v1"
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1"
"connectrpc.com/connect"
retry "github.com/avast/retry-go/v4"
log "github.com/sirupsen/logrus"

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

@ -9,7 +9,7 @@ import (
"testing"
"time"
runnerv1 "code.gitea.io/actions-proto-go/runner/v1"
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1"
connect_go "connectrpc.com/connect"
log "github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"