diff options
27 files changed, 63 insertions, 70 deletions
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5b1ac828..b9328ae9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -88,8 +88,8 @@ jobs: CGO_ENABLED: 0 LDFLAGS: >- -s - -X github.com/roadrunner-server/roadrunner/v2/internal/meta.version=${{ steps.values.outputs.version }} - -X github.com/roadrunner-server/roadrunner/v2/internal/meta.buildTime=${{ steps.values.outputs.timestamp }} + -X github.com/roadrunner-server/roadrunner/v2023/internal/meta.version=${{ steps.values.outputs.version }} + -X github.com/roadrunner-server/roadrunner/v2023/internal/meta.buildTime=${{ steps.values.outputs.timestamp }} run: | go build -trimpath -ldflags "$LDFLAGS" -o "./${{ steps.values.outputs.binary-name }}" ./cmd/rr stat "./${{ steps.values.outputs.binary-name }}" diff --git a/.github/workflows/release_dep.yml b/.github/workflows/release_dep.yml index 24f550be..96f3c6d3 100644 --- a/.github/workflows/release_dep.yml +++ b/.github/workflows/release_dep.yml @@ -56,8 +56,8 @@ jobs: CGO_ENABLED: 0 LDFLAGS: >- -s - -X github.com/roadrunner-server/roadrunner/v2/internal/meta.version=${{ steps.values.outputs.version }} - -X github.com/roadrunner-server/roadrunner/v2/internal/meta.buildTime=${{ steps.values.outputs.timestamp }} + -X github.com/roadrunner-server/roadrunner/v2023/internal/meta.version=${{ steps.values.outputs.version }} + -X github.com/roadrunner-server/roadrunner/v2023/internal/meta.buildTime=${{ steps.values.outputs.timestamp }} run: | go build -trimpath -ldflags "$LDFLAGS" -o "./${{ steps.values.outputs.binary-name }}" ./cmd/rr stat "./${{ steps.values.outputs.binary-name }}" diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2ca514b8..c2737caf 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -121,8 +121,8 @@ jobs: GOARCH: amd64 CGO_ENABLED: 0 LDFLAGS: -s - -X github.com/roadrunner-server/roadrunner/v2/internal/meta.version=${{ steps.values.outputs.version }} - -X github.com/roadrunner-server/roadrunner/v2/internal/meta.buildTime=${{ steps.values.outputs.timestamp }} + -X github.com/roadrunner-server/roadrunner/v2023/internal/meta.version=${{ steps.values.outputs.version }} + -X github.com/roadrunner-server/roadrunner/v2023/internal/meta.buildTime=${{ steps.values.outputs.timestamp }} run: go build -trimpath -ldflags "$LDFLAGS" -o ./rr ./cmd/rr - name: Try to execute @@ -12,8 +12,8 @@ WORKDIR /src # arguments to pass on each go tool link invocation ENV LDFLAGS="-s \ --X github.com/roadrunner-server/roadrunner/v2/internal/meta.version=$APP_VERSION \ --X github.com/roadrunner-server/roadrunner/v2/internal/meta.buildTime=$BUILD_TIME" +-X github.com/roadrunner-server/roadrunner/v2023/internal/meta.version=$APP_VERSION \ +-X github.com/roadrunner-server/roadrunner/v2023/internal/meta.buildTime=$BUILD_TIME" # compile binary file RUN set -x @@ -8,7 +8,7 @@ </p> <p align="center"> <a href="https://packagist.org/packages/spiral/roadrunner"><img src="https://poser.pugx.org/spiral/roadrunner/version"></a> - <a href="https://pkg.go.dev/github.com/roadrunner-server/roadrunner/v2?tab=doc"><img src="https://godoc.org/github.com/roadrunner-server/roadrunner/v2?status.svg"></a> + <a href="https://pkg.go.dev/github.com/roadrunner-server/roadrunner/v2023?tab=doc"><img src="https://godoc.org/github.com/roadrunner-server/roadrunner/v2023?status.svg"></a> <a href="https://twitter.com/spiralphp"><img src="https://img.shields.io/twitter/follow/spiralphp?style=social"></a> <a href="https://codecov.io/gh/roadrunner-server/roadrunner/"><img src="https://codecov.io/gh/roadrunner-server/roadrunner/branch/master/graph/badge.svg"></a> <a href="https://github.com/roadrunner-server/roadrunner/actions"><img src="https://github.com/roadrunner-server/roadrunner/workflows/rr_cli_tests/badge.svg" alt=""></a> diff --git a/cmd/rr/main.go b/cmd/rr/main.go index b065c9fe..d2e13241 100644 --- a/cmd/rr/main.go +++ b/cmd/rr/main.go @@ -5,7 +5,7 @@ import ( "path/filepath" "github.com/fatih/color" - "github.com/roadrunner-server/roadrunner/v2/internal/cli" + "github.com/roadrunner-server/roadrunner/v2023/internal/cli" "go.uber.org/automaxprocs/maxprocs" ) diff --git a/container/config_test.go b/container/config_test.go index 08f1f8b6..fdc81fce 100644 --- a/container/config_test.go +++ b/container/config_test.go @@ -5,7 +5,7 @@ import ( "time" "github.com/roadrunner-server/config/v4" - "github.com/roadrunner-server/roadrunner/v2/container" + "github.com/roadrunner-server/roadrunner/v2023/container" "github.com/stretchr/testify/assert" "golang.org/x/exp/slog" ) diff --git a/container/plugins.go b/container/plugins.go index f983b6eb..93741c79 100644 --- a/container/plugins.go +++ b/container/plugins.go @@ -13,7 +13,6 @@ import ( httpPlugin "github.com/roadrunner-server/http/v4" "github.com/roadrunner-server/informer/v4" "github.com/roadrunner-server/jobs/v4" - //"github.com/roadrunner-server/kafka/v4" "github.com/roadrunner-server/kv/v4" "github.com/roadrunner-server/logger/v4" "github.com/roadrunner-server/memcached/v4" @@ -69,8 +68,6 @@ func Plugins() []any { //nolint:funlen &sqs.Plugin{}, &nats.Plugin{}, &beanstalk.Plugin{}, - // new in 2.11 - //&kafka.Plugin{}, // ========= // // http server plugin with middleware diff --git a/container/test/endure_ok_fatal.yaml b/container/test/endure_ok_error.yaml index 69e16467..a6bfaebc 100644 --- a/container/test/endure_ok_fatal.yaml +++ b/container/test/endure_ok_error.yaml @@ -2,4 +2,4 @@ endure: grace_period: 10s print_graph: true retry_on_fail: true - log_level: fatal + log_level: error diff --git a/container/test/endure_ok_panic.yaml b/container/test/endure_ok_panic.yaml deleted file mode 100644 index 5ac4dc9e..00000000 --- a/container/test/endure_ok_panic.yaml +++ /dev/null @@ -1,5 +0,0 @@ -endure: - grace_period: 10s - print_graph: true - retry_on_fail: true - log_level: panic @@ -1,10 +1,10 @@ -module github.com/roadrunner-server/roadrunner/v2 +module github.com/roadrunner-server/roadrunner/v2023 go 1.19 require ( github.com/buger/goterm v1.0.4 - github.com/dustin/go-humanize v1.0.0 + github.com/dustin/go-humanize v1.0.1 github.com/fatih/color v1.13.0 github.com/joho/godotenv v1.4.0 github.com/olekukonko/tablewriter v0.0.5 @@ -41,7 +41,7 @@ require ( github.com/roadrunner-server/sdk/v4 v4.0.0 github.com/roadrunner-server/send/v4 v4.0.0 github.com/roadrunner-server/server/v4 v4.0.0 - github.com/roadrunner-server/service/v4 v4.0.0 + github.com/roadrunner-server/service/v4 v4.0.2 github.com/roadrunner-server/sqs/v4 v4.0.0 github.com/roadrunner-server/static/v4 v4.0.0 github.com/roadrunner-server/status/v4 v4.0.0 @@ -52,7 +52,7 @@ require ( github.com/temporalio/roadrunner-temporal/v4 v4.0.0 go.buf.build/protocolbuffers/go/roadrunner-server/api v1.3.27 go.uber.org/automaxprocs v1.5.1 - golang.org/x/exp v0.0.0-20230105202349-8879d0199aa3 + golang.org/x/exp v0.0.0-20230113213754-f9f960f08ad4 ) require ( @@ -139,13 +139,13 @@ require ( github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/objx v0.5.0 // indirect - github.com/subosito/gotenv v1.4.1 // indirect + github.com/subosito/gotenv v1.4.2 // indirect github.com/tklauser/go-sysconf v0.3.11 // indirect github.com/tklauser/numcpus v0.6.0 // indirect github.com/twmb/murmur3 v1.1.6 // indirect - github.com/uber-go/tally/v4 v4.1.4 // indirect + github.com/uber-go/tally/v4 v4.1.5 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect - github.com/valyala/fasthttp v1.43.0 // indirect + github.com/valyala/fasthttp v1.44.0 // indirect github.com/valyala/tcplisten v1.0.0 // indirect github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect @@ -169,7 +169,7 @@ require ( go.temporal.io/api v1.14.0 // indirect go.temporal.io/sdk v1.19.0 // indirect go.temporal.io/sdk/contrib/tally v0.2.0 // indirect - go.temporal.io/server v1.19.0 // indirect + go.temporal.io/server v1.19.1 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.9.0 // indirect go.uber.org/zap v1.24.0 // indirect @@ -181,8 +181,8 @@ require ( golang.org/x/text v0.6.0 // indirect golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.5.0 // indirect - google.golang.org/genproto v0.0.0-20230109162033-3c3c17ce83e6 // indirect - google.golang.org/grpc v1.51.0 // indirect + google.golang.org/genproto v0.0.0-20230113154510-dbe35b8444a5 // indirect + google.golang.org/grpc v1.52.0 // indirect google.golang.org/protobuf v1.28.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect @@ -462,8 +462,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= -github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= -github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= +github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/emicklei/proto v1.11.1 h1:CBZwNVwPJvkdevxvsoCuFedF9ENiBz0saen3L9y0OTA= github.com/emicklei/proto v1.11.1/go.mod h1:rn1FgRS/FANiZdD2djyH7TMA9jdRDcYQ9IEN9yvjX0A= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -817,8 +817,8 @@ github.com/roadrunner-server/send/v4 v4.0.0 h1:v51GqqWGHPpGRA9O9N6qV4ku+MtfW97tQ github.com/roadrunner-server/send/v4 v4.0.0/go.mod h1:GIQUMT3VS3XXDYbWxF1ZeHDBt3Th9sdxvHq/janA6QE= github.com/roadrunner-server/server/v4 v4.0.0 h1:S5YhlvpiNS+FTWjBM9hsVonCXteUGnI7tDOUbqL5u9U= github.com/roadrunner-server/server/v4 v4.0.0/go.mod h1:pskfIK77QvJui9a6z9WNpikuTV2OLPoiiB+7eYrkQ3E= -github.com/roadrunner-server/service/v4 v4.0.0 h1:486SSD9mSqioWVQVWfIghn2mfMCEtwMqXiO84cL7hJY= -github.com/roadrunner-server/service/v4 v4.0.0/go.mod h1:ACrVtE4LjPAFWl6grDTTE4rHP84QEVFPlyFjlUIiIs8= +github.com/roadrunner-server/service/v4 v4.0.2 h1:uSeHJsnaJI/AEiVEwFxvKwadTAHQbJTInXRbwFHwvBM= +github.com/roadrunner-server/service/v4 v4.0.2/go.mod h1:ACrVtE4LjPAFWl6grDTTE4rHP84QEVFPlyFjlUIiIs8= github.com/roadrunner-server/sqs/v4 v4.0.0 h1:askwmur5SIVgnB1UzSXzuTP70FBlXWqiK8X652cE30A= github.com/roadrunner-server/sqs/v4 v4.0.0/go.mod h1:G7fqmSyrcFBGmpRakttpLvmWM00WDQWp53lSUstbDow= github.com/roadrunner-server/static/v4 v4.0.0 h1:23yfaUwVYc7BKmFk3HLU4m6MVrfgb5zcM59GOhMOAS4= @@ -874,8 +874,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs= -github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= +github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= +github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/temporalio/roadrunner-temporal/v4 v4.0.0 h1:BSh0CquOw6gW24xPW16t6SkI6nYNjrg7b91Qcg/UYQ0= github.com/temporalio/roadrunner-temporal/v4 v4.0.0/go.mod h1:G9sBbZWg66yD9pPtylCaB2/xr/RxCG19K99kTecezPY= github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= @@ -886,12 +886,12 @@ github.com/twmb/murmur3 v1.1.5/go.mod h1:Qq/R7NUyOfr65zD+6Q5IHKsJLwP7exErjN6lyyq github.com/twmb/murmur3 v1.1.6 h1:mqrRot1BRxm+Yct+vavLMou2/iJt0tNVTTC0QoIjaZg= github.com/twmb/murmur3 v1.1.6/go.mod h1:Qq/R7NUyOfr65zD+6Q5IHKsJLwP7exErjN6lyyq3OSQ= github.com/uber-go/tally/v4 v4.1.1/go.mod h1:aXeSTDMl4tNosyf6rdU8jlgScHyjEGGtfJ/uwCIf/vM= -github.com/uber-go/tally/v4 v4.1.4 h1:LzQyYvWQIp1gYNWU2tDNzVl04H2VchEUvMgabx/7MTI= -github.com/uber-go/tally/v4 v4.1.4/go.mod h1:aXeSTDMl4tNosyf6rdU8jlgScHyjEGGtfJ/uwCIf/vM= +github.com/uber-go/tally/v4 v4.1.5 h1:PlOR9dUoE1GV/xAk+coMnoxrR+j6Fz5qjKb49TUjBf8= +github.com/uber-go/tally/v4 v4.1.5/go.mod h1:aXeSTDMl4tNosyf6rdU8jlgScHyjEGGtfJ/uwCIf/vM= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasthttp v1.43.0 h1:Gy4sb32C98fbzVWZlTM1oTMdLWGyvxR03VhM6cBIU4g= -github.com/valyala/fasthttp v1.43.0/go.mod h1:f6VbjjoI3z1NDOZOv17o6RvtRSWxC77seBFc2uWtgiY= +github.com/valyala/fasthttp v1.44.0 h1:R+gLUhldIsfg1HokMuQjdQ5bh9nuXHPIfvkYUu9eR5Q= +github.com/valyala/fasthttp v1.44.0/go.mod h1:f6VbjjoI3z1NDOZOv17o6RvtRSWxC77seBFc2uWtgiY= github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8= github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9znI5mJU= @@ -958,8 +958,8 @@ go.temporal.io/sdk v1.19.0 h1:qGSU8SRbwWoJy0XJpDFtEu/PUpU7Q9oE+5OhT11je3U= go.temporal.io/sdk v1.19.0/go.mod h1:d+iTyxAZzRdhemExMVJ/9GyHv93eHO0vYeaAqcLchss= go.temporal.io/sdk/contrib/tally v0.2.0 h1:XnTJIQcjOv+WuCJ1u8Ve2nq+s2H4i/fys34MnWDRrOo= go.temporal.io/sdk/contrib/tally v0.2.0/go.mod h1:1kpSuCms/tHeJQDPuuKkaBsMqfHnIIRnCtUYlPNXxuE= -go.temporal.io/server v1.19.0 h1:xyWLWxPAvJaY0zLPmexEUPyQEY4TxEpHOwH+wvRX/hE= -go.temporal.io/server v1.19.0/go.mod h1:XklHpjqKG7/fFbqQ7fFJT+iqpCUqPAwAi18/uPYoLVA= +go.temporal.io/server v1.19.1 h1:QaY1SbOH7Qnj62NnYNbV2GKDqHWWfwYANEJ3BF+5Nyo= +go.temporal.io/server v1.19.1/go.mod h1:XklHpjqKG7/fFbqQ7fFJT+iqpCUqPAwAi18/uPYoLVA= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= @@ -1001,8 +1001,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20230105202349-8879d0199aa3 h1:fJwx88sMf5RXwDwziL0/Mn9Wqs+efMSo/RYcL+37W9c= -golang.org/x/exp v0.0.0-20230105202349-8879d0199aa3/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp v0.0.0-20230113213754-f9f960f08ad4 h1:CNkDRtCj8otM5CFz5jYvbr8ioXX8flVsLfDWEj0M5kk= +golang.org/x/exp v0.0.0-20230113213754-f9f960f08ad4/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -1480,8 +1480,8 @@ google.golang.org/genproto v0.0.0-20221117204609-8f9c96812029/go.mod h1:rZS5c/ZV google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg= google.golang.org/genproto v0.0.0-20221201164419-0e50fba7f41c/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg= google.golang.org/genproto v0.0.0-20221207170731-23e4bf6bdc37/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= -google.golang.org/genproto v0.0.0-20230109162033-3c3c17ce83e6 h1:uUn6GsgKK2eCI0bWeRMgRCcqDaQXYDuB+5tXA5Xeg/8= -google.golang.org/genproto v0.0.0-20230109162033-3c3c17ce83e6/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= +google.golang.org/genproto v0.0.0-20230113154510-dbe35b8444a5 h1:wJT65XLOzhpSPCdAmmKfz94SlmnQzDzjm3Cj9k3fsXY= +google.golang.org/genproto v0.0.0-20230113154510-dbe35b8444a5/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= @@ -1520,8 +1520,9 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.51.0 h1:E1eGv1FTqoLIdnBCZufiSHgKjlqG6fKFf6pPWtMTh8U= google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww= +google.golang.org/grpc v1.52.0 h1:kd48UiU7EHsV4rnLyOJRuP/Il/UHE7gdDAQ+SZI7nZk= +google.golang.org/grpc v1.52.0/go.mod h1:pu6fVzoFb+NBYNAvQL08ic+lvB2IojljRYuun5vorUY= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= diff --git a/internal/cli/jobs/command.go b/internal/cli/jobs/command.go index a2777208..589b7710 100644 --- a/internal/cli/jobs/command.go +++ b/internal/cli/jobs/command.go @@ -3,7 +3,7 @@ package jobs import ( "strings" - internalRpc "github.com/roadrunner-server/roadrunner/v2/internal/rpc" + internalRpc "github.com/roadrunner-server/roadrunner/v2023/internal/rpc" "github.com/roadrunner-server/errors" "github.com/spf13/cobra" diff --git a/internal/cli/jobs/command_test.go b/internal/cli/jobs/command_test.go index 74042479..ec4912d1 100644 --- a/internal/cli/jobs/command_test.go +++ b/internal/cli/jobs/command_test.go @@ -3,7 +3,7 @@ package jobs_test import ( "testing" - "github.com/roadrunner-server/roadrunner/v2/internal/cli/jobs" + "github.com/roadrunner-server/roadrunner/v2023/internal/cli/jobs" "github.com/stretchr/testify/assert" ) diff --git a/internal/cli/reset/command.go b/internal/cli/reset/command.go index f48856cc..7f7eaffe 100644 --- a/internal/cli/reset/command.go +++ b/internal/cli/reset/command.go @@ -4,7 +4,7 @@ import ( "log" "sync" - internalRpc "github.com/roadrunner-server/roadrunner/v2/internal/rpc" + internalRpc "github.com/roadrunner-server/roadrunner/v2023/internal/rpc" "github.com/roadrunner-server/errors" "github.com/spf13/cobra" diff --git a/internal/cli/reset/command_test.go b/internal/cli/reset/command_test.go index 8192ca9c..30e77556 100644 --- a/internal/cli/reset/command_test.go +++ b/internal/cli/reset/command_test.go @@ -3,7 +3,7 @@ package reset_test import ( "testing" - "github.com/roadrunner-server/roadrunner/v2/internal/cli/reset" + "github.com/roadrunner-server/roadrunner/v2023/internal/cli/reset" "github.com/stretchr/testify/assert" ) diff --git a/internal/cli/root.go b/internal/cli/root.go index 81ea75d2..293e10b6 100644 --- a/internal/cli/root.go +++ b/internal/cli/root.go @@ -8,13 +8,13 @@ import ( "strconv" "github.com/roadrunner-server/errors" - "github.com/roadrunner-server/roadrunner/v2/internal/cli/jobs" - "github.com/roadrunner-server/roadrunner/v2/internal/cli/reset" - "github.com/roadrunner-server/roadrunner/v2/internal/cli/serve" - "github.com/roadrunner-server/roadrunner/v2/internal/cli/stop" - "github.com/roadrunner-server/roadrunner/v2/internal/cli/workers" - dbg "github.com/roadrunner-server/roadrunner/v2/internal/debug" - "github.com/roadrunner-server/roadrunner/v2/internal/meta" + "github.com/roadrunner-server/roadrunner/v2023/internal/cli/jobs" + "github.com/roadrunner-server/roadrunner/v2023/internal/cli/reset" + "github.com/roadrunner-server/roadrunner/v2023/internal/cli/serve" + "github.com/roadrunner-server/roadrunner/v2023/internal/cli/stop" + "github.com/roadrunner-server/roadrunner/v2023/internal/cli/workers" + dbg "github.com/roadrunner-server/roadrunner/v2023/internal/debug" + "github.com/roadrunner-server/roadrunner/v2023/internal/meta" "github.com/joho/godotenv" "github.com/spf13/cobra" diff --git a/internal/cli/root_test.go b/internal/cli/root_test.go index f77acec3..b9795444 100644 --- a/internal/cli/root_test.go +++ b/internal/cli/root_test.go @@ -5,7 +5,7 @@ import ( "path" "testing" - "github.com/roadrunner-server/roadrunner/v2/internal/cli" + "github.com/roadrunner-server/roadrunner/v2023/internal/cli" "github.com/stretchr/testify/require" "github.com/spf13/cobra" diff --git a/internal/cli/serve/command.go b/internal/cli/serve/command.go index c508fafe..2bdb7565 100644 --- a/internal/cli/serve/command.go +++ b/internal/cli/serve/command.go @@ -7,8 +7,8 @@ import ( "syscall" "github.com/roadrunner-server/endure/v2" - "github.com/roadrunner-server/roadrunner/v2/container" - "github.com/roadrunner-server/roadrunner/v2/internal/meta" + "github.com/roadrunner-server/roadrunner/v2023/container" + "github.com/roadrunner-server/roadrunner/v2023/internal/meta" configImpl "github.com/roadrunner-server/config/v4" "github.com/roadrunner-server/errors" diff --git a/internal/cli/serve/command_test.go b/internal/cli/serve/command_test.go index 4c8c6128..69ff64f0 100644 --- a/internal/cli/serve/command_test.go +++ b/internal/cli/serve/command_test.go @@ -3,7 +3,7 @@ package serve_test import ( "testing" - "github.com/roadrunner-server/roadrunner/v2/internal/cli/serve" + "github.com/roadrunner-server/roadrunner/v2023/internal/cli/serve" "github.com/stretchr/testify/assert" ) diff --git a/internal/cli/stop/command_test.go b/internal/cli/stop/command_test.go index 13f01bed..a62ca987 100644 --- a/internal/cli/stop/command_test.go +++ b/internal/cli/stop/command_test.go @@ -3,7 +3,7 @@ package stop_test import ( "testing" - "github.com/roadrunner-server/roadrunner/v2/internal/cli/stop" + "github.com/roadrunner-server/roadrunner/v2023/internal/cli/stop" "github.com/stretchr/testify/assert" ) diff --git a/internal/cli/workers/command.go b/internal/cli/workers/command.go index 00237152..2af03745 100644 --- a/internal/cli/workers/command.go +++ b/internal/cli/workers/command.go @@ -9,7 +9,7 @@ import ( "time" "github.com/roadrunner-server/api/v3/plugins/v1/jobs" - internalRpc "github.com/roadrunner-server/roadrunner/v2/internal/rpc" + internalRpc "github.com/roadrunner-server/roadrunner/v2023/internal/rpc" tm "github.com/buger/goterm" "github.com/fatih/color" diff --git a/internal/cli/workers/command_test.go b/internal/cli/workers/command_test.go index c68ec9b1..36e67ef0 100644 --- a/internal/cli/workers/command_test.go +++ b/internal/cli/workers/command_test.go @@ -3,7 +3,7 @@ package workers_test import ( "testing" - "github.com/roadrunner-server/roadrunner/v2/internal/cli/workers" + "github.com/roadrunner-server/roadrunner/v2023/internal/cli/workers" "github.com/stretchr/testify/assert" ) diff --git a/internal/debug/server_test.go b/internal/debug/server_test.go index 37df0636..de48fbbc 100644 --- a/internal/debug/server_test.go +++ b/internal/debug/server_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/roadrunner-server/roadrunner/v2/internal/debug" + "github.com/roadrunner-server/roadrunner/v2023/internal/debug" "github.com/stretchr/testify/assert" ) diff --git a/internal/rpc/client_test.go b/internal/rpc/client_test.go index fc03981d..71f3ce7b 100644 --- a/internal/rpc/client_test.go +++ b/internal/rpc/client_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/roadrunner-server/config/v4" - "github.com/roadrunner-server/roadrunner/v2/internal/rpc" + "github.com/roadrunner-server/roadrunner/v2023/internal/rpc" "github.com/stretchr/testify/require" "github.com/stretchr/testify/assert" diff --git a/lib/roadrunner.go b/lib/roadrunner.go index b377a83d..f030f526 100644 --- a/lib/roadrunner.go +++ b/lib/roadrunner.go @@ -6,12 +6,12 @@ import ( configImpl "github.com/roadrunner-server/config/v4" "github.com/roadrunner-server/endure/v2" - "github.com/roadrunner-server/roadrunner/v2/container" + "github.com/roadrunner-server/roadrunner/v2023/container" ) const ( rrPrefix string = "rr" - rrModule string = "github.com/roadrunner-server/roadrunner/v2" + rrModule string = "github.com/roadrunner-server/roadrunner/v2023" ) type RR struct { diff --git a/lib/roadrunner_test.go b/lib/roadrunner_test.go index 7a932b7e..42d0964d 100644 --- a/lib/roadrunner_test.go +++ b/lib/roadrunner_test.go @@ -7,7 +7,7 @@ import ( "github.com/roadrunner-server/informer/v4" "github.com/roadrunner-server/resetter/v4" - "github.com/roadrunner-server/roadrunner/v2/lib" + "github.com/roadrunner-server/roadrunner/v2023/lib" "github.com/stretchr/testify/assert" ) |