From 44988db9f89d2c55128688ec69309050aa140dcc Mon Sep 17 00:00:00 2001 From: Jason Song Date: Tue, 22 Nov 2022 12:22:19 +0800 Subject: [PATCH] chore: replace with code.gitea.io/bots-proto-go --- client/client.go | 4 ++-- client/http.go | 4 ++-- cmd/register.go | 2 +- go.mod | 4 ++-- go.sum | 10 +++++----- poller/poller.go | 2 +- register/register.go | 2 +- runtime/reporter.go | 2 +- runtime/runtime.go | 2 +- runtime/task.go | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/client/client.go b/client/client.go index 7d038fd..c271538 100644 --- a/client/client.go +++ b/client/client.go @@ -1,8 +1,8 @@ package client import ( - "gitea.com/gitea/proto-go/ping/v1/pingv1connect" - "gitea.com/gitea/proto-go/runner/v1/runnerv1connect" + "code.gitea.io/bots-proto-go/ping/v1/pingv1connect" + "code.gitea.io/bots-proto-go/runner/v1/runnerv1connect" ) type Filter struct { diff --git a/client/http.go b/client/http.go index a97cd22..6e8ced5 100644 --- a/client/http.go +++ b/client/http.go @@ -6,8 +6,8 @@ import ( "net/http" "time" - "gitea.com/gitea/proto-go/ping/v1/pingv1connect" - "gitea.com/gitea/proto-go/runner/v1/runnerv1connect" + "code.gitea.io/bots-proto-go/ping/v1/pingv1connect" + "code.gitea.io/bots-proto-go/runner/v1/runnerv1connect" "golang.org/x/net/http2" ) diff --git a/cmd/register.go b/cmd/register.go index c5cb237..3a7635b 100644 --- a/cmd/register.go +++ b/cmd/register.go @@ -10,10 +10,10 @@ import ( "strings" "time" + pingv1 "code.gitea.io/bots-proto-go/ping/v1" "gitea.com/gitea/act_runner/client" "gitea.com/gitea/act_runner/config" "gitea.com/gitea/act_runner/register" - pingv1 "gitea.com/gitea/proto-go/ping/v1" "github.com/appleboy/com/file" "github.com/bufbuild/connect-go" "github.com/joho/godotenv" diff --git a/go.mod b/go.mod index 491b62c..5a238df 100644 --- a/go.mod +++ b/go.mod @@ -3,10 +3,10 @@ module gitea.com/gitea/act_runner go 1.18 require ( - gitea.com/gitea/proto-go v0.0.0-20221118134050-62e4a9f56c7d + code.gitea.io/bots-proto-go v0.1.0 github.com/appleboy/com v0.1.6 github.com/avast/retry-go/v4 v4.1.0 - github.com/bufbuild/connect-go v0.5.0 + github.com/bufbuild/connect-go v1.1.0 github.com/docker/docker v20.10.17+incompatible github.com/joho/godotenv v1.4.0 github.com/kelseyhightower/envconfig v1.4.0 diff --git a/go.sum b/go.sum index 13ad3a6..200cbe1 100644 --- a/go.sum +++ b/go.sum @@ -22,11 +22,11 @@ cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIA cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= +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= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= gitea.com/gitea/act v0.0.0-20221122021430-4cb0cf58c8d1 h1:ZDZJEFXCkBUBZ/RAPPhOTboNpdyxlMbb9SZaTYWSYv4= gitea.com/gitea/act v0.0.0-20221122021430-4cb0cf58c8d1/go.mod h1:lpzib6X73FHLSaTqTakan1xcsCAVhlZvPSpLns7jkRo= -gitea.com/gitea/proto-go v0.0.0-20221118134050-62e4a9f56c7d h1:xqNMHMmgliaehWAzMtWdqL6/ThdrYLZa/wPky9XdnMU= -gitea.com/gitea/proto-go v0.0.0-20221118134050-62e4a9f56c7d/go.mod h1:hD8YwSHusjwjEEgubW6XFvnZuNhMZTHz6lwjfltEt/Y= github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= @@ -107,8 +107,8 @@ github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnweb github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= -github.com/bufbuild/connect-go v0.5.0 h1:JFbWPWpasBqzM5h/awoRhAXmLERZQlQ5xTn42uf+5ao= -github.com/bufbuild/connect-go v0.5.0/go.mod h1:ZEtBnQ7J/m7bvWOW+H8T/+hKQCzPVfhhhICuvtcnjlI= +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/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8= github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50= @@ -403,7 +403,7 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-containerregistry v0.5.1/go.mod h1:Ct15B4yir3PLOP5jsy0GNeYVaIZs/MK/Jz5any1wFW0= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= diff --git a/poller/poller.go b/poller/poller.go index 1e83cfe..9010236 100644 --- a/poller/poller.go +++ b/poller/poller.go @@ -6,8 +6,8 @@ import ( "sync" "time" + runnerv1 "code.gitea.io/bots-proto-go/runner/v1" "gitea.com/gitea/act_runner/client" - runnerv1 "gitea.com/gitea/proto-go/runner/v1" "github.com/bufbuild/connect-go" log "github.com/sirupsen/logrus" diff --git a/register/register.go b/register/register.go index cf80b54..93ea631 100644 --- a/register/register.go +++ b/register/register.go @@ -5,10 +5,10 @@ import ( "encoding/json" "os" + runnerv1 "code.gitea.io/bots-proto-go/runner/v1" "gitea.com/gitea/act_runner/client" "gitea.com/gitea/act_runner/config" "gitea.com/gitea/act_runner/core" - runnerv1 "gitea.com/gitea/proto-go/runner/v1" "github.com/bufbuild/connect-go" log "github.com/sirupsen/logrus" diff --git a/runtime/reporter.go b/runtime/reporter.go index 86daf64..692e709 100644 --- a/runtime/reporter.go +++ b/runtime/reporter.go @@ -7,8 +7,8 @@ import ( "sync" "time" + runnerv1 "code.gitea.io/bots-proto-go/runner/v1" "gitea.com/gitea/act_runner/client" - runnerv1 "gitea.com/gitea/proto-go/runner/v1" "github.com/avast/retry-go/v4" "github.com/bufbuild/connect-go" diff --git a/runtime/runtime.go b/runtime/runtime.go index 4b304d3..439e8fa 100644 --- a/runtime/runtime.go +++ b/runtime/runtime.go @@ -3,8 +3,8 @@ package runtime import ( "context" + runnerv1 "code.gitea.io/bots-proto-go/runner/v1" "gitea.com/gitea/act_runner/client" - runnerv1 "gitea.com/gitea/proto-go/runner/v1" ) // Runner runs the pipeline. diff --git a/runtime/task.go b/runtime/task.go index 821a386..dc5184f 100644 --- a/runtime/task.go +++ b/runtime/task.go @@ -10,8 +10,8 @@ import ( "sync" "time" + runnerv1 "code.gitea.io/bots-proto-go/runner/v1" "gitea.com/gitea/act_runner/client" - runnerv1 "gitea.com/gitea/proto-go/runner/v1" "github.com/nektos/act/pkg/artifacts" "github.com/nektos/act/pkg/common"