diff --git a/go.mod b/go.mod index d731715b09..a06d7858a0 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module code.gitea.io/gitea go 1.18 require ( - code.gitea.io/bots-proto-go v0.1.0 + code.gitea.io/actions-proto-go v0.2.0 code.gitea.io/gitea-vet v0.2.2 code.gitea.io/sdk/gitea v0.15.1 codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570 @@ -18,7 +18,7 @@ require ( github.com/PuerkitoBio/goquery v1.8.0 github.com/alecthomas/chroma/v2 v2.4.0 github.com/blevesearch/bleve/v2 v2.3.4 - github.com/bufbuild/connect-go v1.1.0 + github.com/bufbuild/connect-go v1.3.1 github.com/bufbuild/connect-grpchealth-go v1.0.0 github.com/bufbuild/connect-grpcreflect-go v1.0.0 github.com/buildkite/terminal-to-html/v3 v3.7.0 diff --git a/go.sum b/go.sum index 6f0fbcb780..5366a5d4d5 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y= -code.gitea.io/bots-proto-go v0.1.0 h1:H+01Pcb7j6+l3TDj/0YFOJvPYbcKkzSBXg1qoGz/qc8= -code.gitea.io/bots-proto-go v0.1.0/go.mod h1:tZCdF4XQ1216T+JUHw2A091PA/QP3HLx7IXPv1l3v5c= +code.gitea.io/actions-proto-go v0.2.0 h1:nYh9nhhfk67YA4wVNLsCzd//RCvXnljwXClJ33+HPVk= +code.gitea.io/actions-proto-go v0.2.0/go.mod h1:00ys5QDo1iHN1tHNvvddAcy2W/g+425hQya1cCSvq9A= code.gitea.io/gitea-vet v0.2.1/go.mod h1:zcNbT/aJEmivCAhfmkHOlT645KNOf9W2KnkLgFjGGfE= code.gitea.io/gitea-vet v0.2.2 h1:TEOV/Glf38iGmKzKP0EB++Z5OSL4zGg3RrAvlwaMuvk= code.gitea.io/gitea-vet v0.2.2/go.mod h1:zcNbT/aJEmivCAhfmkHOlT645KNOf9W2KnkLgFjGGfE= @@ -282,8 +282,8 @@ github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl github.com/bradfitz/gomemcache v0.0.0-20190329173943-551aad21a668/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA= github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b h1:L/QXpzIa3pOvUGt1D1lA5KjYhPBAN/3iWdP7xeFS9F0= github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA= -github.com/bufbuild/connect-go v1.1.0 h1:AUgqqO2ePdOJSpPOep6BPYz5v2moW1Lb8sQh0EeRzQ8= -github.com/bufbuild/connect-go v1.1.0/go.mod h1:9iNvh/NOsfhNBUH5CtvXeVUskQO1xsrEviH7ZArwZ3I= +github.com/bufbuild/connect-go v1.3.1 h1:doJP6Q8Ypg6haUT2IAZJPWHUN9rAUp+F9MfK7yhu1zs= +github.com/bufbuild/connect-go v1.3.1/go.mod h1:9iNvh/NOsfhNBUH5CtvXeVUskQO1xsrEviH7ZArwZ3I= github.com/bufbuild/connect-grpchealth-go v1.0.0 h1:33v883tL86jLomQT6R2ZYVYaI2cRkuUXvU30WfbQ/ko= github.com/bufbuild/connect-grpchealth-go v1.0.0/go.mod h1:6OEb4J3rh5+Wdvt4/muOIfZo1lt9cPU8ggwpsjBaZ3Y= github.com/bufbuild/connect-grpcreflect-go v1.0.0 h1:zWsLFYqrT1O2sNJFYfTXI5WxbAyiY2dvevvnJHPtV5A= diff --git a/models/actions/runner.go b/models/actions/runner.go index d539926757..63b2ec1b9c 100644 --- a/models/actions/runner.go +++ b/models/actions/runner.go @@ -14,7 +14,7 @@ import ( user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/timeutil" - runnerv1 "code.gitea.io/bots-proto-go/runner/v1" + runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "xorm.io/builder" ) diff --git a/models/actions/status.go b/models/actions/status.go index b278efaf86..acffde4f43 100644 --- a/models/actions/status.go +++ b/models/actions/status.go @@ -3,7 +3,7 @@ package actions -import runnerv1 "code.gitea.io/bots-proto-go/runner/v1" +import runnerv1 "code.gitea.io/actions-proto-go/runner/v1" // Status represents the status of BotRun, BotRunJob, BotTask, or BotTaskStep type Status int diff --git a/models/actions/task.go b/models/actions/task.go index e0d8490b63..b9c75e74af 100644 --- a/models/actions/task.go +++ b/models/actions/task.go @@ -21,7 +21,7 @@ import ( "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" - runnerv1 "code.gitea.io/bots-proto-go/runner/v1" + runnerv1 "code.gitea.io/actions-proto-go/runner/v1" lru "github.com/hashicorp/golang-lru" "github.com/nektos/act/pkg/jobparser" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/modules/actions/log.go b/modules/actions/log.go index ddc517a7ba..cdfb67fb33 100644 --- a/modules/actions/log.go +++ b/modules/actions/log.go @@ -16,7 +16,7 @@ import ( "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/storage" - runnerv1 "code.gitea.io/bots-proto-go/runner/v1" + runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/routers/api/actions/grpc/grpc.go b/routers/api/actions/grpc/grpc.go index 6e0149a463..b20ab38ec2 100644 --- a/routers/api/actions/grpc/grpc.go +++ b/routers/api/actions/grpc/grpc.go @@ -6,8 +6,8 @@ package grpc import ( "net/http" - "code.gitea.io/bots-proto-go/ping/v1/pingv1connect" - "code.gitea.io/bots-proto-go/runner/v1/runnerv1connect" + "code.gitea.io/actions-proto-go/ping/v1/pingv1connect" + "code.gitea.io/actions-proto-go/runner/v1/runnerv1connect" "github.com/bufbuild/connect-go" grpcreflect "github.com/bufbuild/connect-grpcreflect-go" "google.golang.org/grpc/health/grpc_health_v1" diff --git a/routers/api/actions/grpc/ping.go b/routers/api/actions/grpc/ping.go index ecc4e8c3c2..fc874b6fa9 100644 --- a/routers/api/actions/grpc/ping.go +++ b/routers/api/actions/grpc/ping.go @@ -8,7 +8,7 @@ import ( "code.gitea.io/gitea/routers/api/actions/ping" - "code.gitea.io/bots-proto-go/ping/v1/pingv1connect" + "code.gitea.io/actions-proto-go/ping/v1/pingv1connect" ) func PingRoute() (string, http.Handler) { diff --git a/routers/api/actions/grpc/runner.go b/routers/api/actions/grpc/runner.go index ae31516653..74654c111b 100644 --- a/routers/api/actions/grpc/runner.go +++ b/routers/api/actions/grpc/runner.go @@ -8,7 +8,7 @@ import ( "code.gitea.io/gitea/routers/api/actions/runner" - "code.gitea.io/bots-proto-go/runner/v1/runnerv1connect" + "code.gitea.io/actions-proto-go/runner/v1/runnerv1connect" ) func RunnerRoute() (string, http.Handler) { diff --git a/routers/api/actions/ping/ping.go b/routers/api/actions/ping/ping.go index 2efabfecf2..844f78634b 100644 --- a/routers/api/actions/ping/ping.go +++ b/routers/api/actions/ping/ping.go @@ -9,8 +9,8 @@ import ( "code.gitea.io/gitea/modules/log" - pingv1 "code.gitea.io/bots-proto-go/ping/v1" - "code.gitea.io/bots-proto-go/ping/v1/pingv1connect" + pingv1 "code.gitea.io/actions-proto-go/ping/v1" + "code.gitea.io/actions-proto-go/ping/v1/pingv1connect" "github.com/bufbuild/connect-go" ) diff --git a/routers/api/actions/ping/ping_test.go b/routers/api/actions/ping/ping_test.go index b17e4d0b02..bca0e820b8 100644 --- a/routers/api/actions/ping/ping_test.go +++ b/routers/api/actions/ping/ping_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "code.gitea.io/bots-proto-go/ping/v1/pingv1connect" + "code.gitea.io/actions-proto-go/ping/v1/pingv1connect" ) func TestService(t *testing.T) { diff --git a/routers/api/actions/ping/testping.go b/routers/api/actions/ping/testping.go index f682d95cc1..5f48d0cb55 100644 --- a/routers/api/actions/ping/testping.go +++ b/routers/api/actions/ping/testping.go @@ -9,8 +9,8 @@ import ( "net/http/httptest" "testing" - pingv1 "code.gitea.io/bots-proto-go/ping/v1" - "code.gitea.io/bots-proto-go/ping/v1/pingv1connect" + pingv1 "code.gitea.io/actions-proto-go/ping/v1" + "code.gitea.io/actions-proto-go/ping/v1/pingv1connect" "github.com/bufbuild/connect-go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/routers/api/actions/runner/runner.go b/routers/api/actions/runner/runner.go index 3ae490c77a..ce26c42698 100644 --- a/routers/api/actions/runner/runner.go +++ b/routers/api/actions/runner/runner.go @@ -18,8 +18,8 @@ import ( actions_service "code.gitea.io/gitea/services/actions" secret_service "code.gitea.io/gitea/services/secrets" - runnerv1 "code.gitea.io/bots-proto-go/runner/v1" - "code.gitea.io/bots-proto-go/runner/v1/runnerv1connect" + runnerv1 "code.gitea.io/actions-proto-go/runner/v1" + "code.gitea.io/actions-proto-go/runner/v1/runnerv1connect" "github.com/bufbuild/connect-go" gouuid "github.com/google/uuid" "google.golang.org/grpc/codes" diff --git a/routers/web/repo/actions/view.go b/routers/web/repo/actions/view.go index 856de14c3e..e012587206 100644 --- a/routers/web/repo/actions/view.go +++ b/routers/web/repo/actions/view.go @@ -17,7 +17,7 @@ import ( "code.gitea.io/gitea/modules/web" actions_service "code.gitea.io/gitea/services/actions" - runnerv1 "code.gitea.io/bots-proto-go/runner/v1" + runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "xorm.io/builder" )