diff --git a/.github/workflows/wrpc.yml b/.github/workflows/wrpc.yml index 08244b32..0cf6a7d6 100644 --- a/.github/workflows/wrpc.yml +++ b/.github/workflows/wrpc.yml @@ -150,20 +150,7 @@ jobs: - uses: ./.github/actions/install-nix with: cachixAuthToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - - run: go mod vendor -e -v - working-directory: tests/go - if: ${{ matrix.check }} == "nextest" - - run: go mod vendor -e -v - working-directory: examples/go/hello-client - if: ${{ matrix.check }} == "nextest" - - run: go mod vendor -e -v - working-directory: examples/go/hello-server - if: ${{ matrix.check }} == "nextest" - - run: go mod vendor -e -v - working-directory: examples/go/http-outgoing-nats-server - if: ${{ matrix.check }} == "nextest" - - run: go mod vendor -e -v - working-directory: examples/go/keyvalue-server + - run: go work vendor -e -v if: ${{ matrix.check }} == "nextest" - run: git add . if: ${{ matrix.check }} == "nextest" diff --git a/examples/go/hello-client/cmd/hello-client-nats/main.go b/examples/go/hello-client/cmd/hello-client-nats/main.go index 43a7cc07..ed143f4c 100644 --- a/examples/go/hello-client/cmd/hello-client-nats/main.go +++ b/examples/go/hello-client/cmd/hello-client-nats/main.go @@ -8,7 +8,7 @@ import ( "os" "github.com/nats-io/nats.go" - "github.com/wrpc/wrpc/examples/go/hello-server/bindings/wrpc_examples/hello/handler" + "github.com/wrpc/wrpc/examples/go/hello-client/bindings/wrpc_examples/hello/handler" wrpcnats "github.com/wrpc/wrpc/go/nats" ) diff --git a/examples/go/hello-client/go.mod b/examples/go/hello-client/go.mod index 8ccc633f..38bdaffb 100644 --- a/examples/go/hello-client/go.mod +++ b/examples/go/hello-client/go.mod @@ -1,4 +1,4 @@ -module github.com/wrpc/wrpc/examples/go/hello-server +module github.com/wrpc/wrpc/examples/go/hello-client go 1.22.2 diff --git a/go.work b/go.work new file mode 100644 index 00000000..f9f47761 --- /dev/null +++ b/go.work @@ -0,0 +1,12 @@ +go 1.22.2 + +use ( + examples/go/hello-client + examples/go/hello-server + examples/go/http-outgoing-nats-server + examples/go/keyvalue-server + go + tests/go +) + +replace github.com/wrpc/wrpc/go v0.0.0-unpublished => ./go diff --git a/go.work.sum b/go.work.sum new file mode 100644 index 00000000..233c604d --- /dev/null +++ b/go.work.sum @@ -0,0 +1,6 @@ +github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= diff --git a/go/go.mod b/go/go.mod index c0976764..d2b472ba 100644 --- a/go/go.mod +++ b/go/go.mod @@ -2,13 +2,15 @@ module github.com/wrpc/wrpc/go go 1.22.2 -require github.com/nats-io/nats.go v1.34.1 +require ( + github.com/nats-io/nats.go v1.34.1 + golang.org/x/sync v0.7.0 +) require ( - github.com/klauspost/compress v1.17.2 // indirect + github.com/klauspost/compress v1.17.8 // indirect github.com/nats-io/nkeys v0.4.7 // indirect github.com/nats-io/nuid v1.0.1 // indirect - golang.org/x/crypto v0.18.0 // indirect - golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.16.0 // indirect + golang.org/x/crypto v0.22.0 // indirect + golang.org/x/sys v0.19.0 // indirect ) diff --git a/go/go.sum b/go/go.sum index 1934caec..c7e7e26d 100644 --- a/go/go.sum +++ b/go/go.sum @@ -1,14 +1,7 @@ -github.com/klauspost/compress v1.17.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/ixi4= -github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= github.com/nats-io/nats.go v1.34.1 h1:syWey5xaNHZgicYBemv0nohUPPmaLteiBEUT6Q5+F/4= -github.com/nats-io/nats.go v1.34.1/go.mod h1:Ubdu4Nh9exXdSz0RVWRFBbRfrbSxOYd26oF0wkWclB8= github.com/nats-io/nkeys v0.4.7 h1:RwNJbbIdYCoClSDNY7QVKZlyb/wfT6ugvFCiKy6vDvI= -github.com/nats-io/nkeys v0.4.7/go.mod h1:kqXRgRDPlGy7nGaEDMuYzmiJCIAAWDK0IMBtDmGD0nc= github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= -github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= -golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= +golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= diff --git a/tests/go/go.mod b/tests/go/go.mod index 8d0b2361..59d6885e 100644 --- a/tests/go/go.mod +++ b/tests/go/go.mod @@ -10,7 +10,7 @@ require ( ) require ( - github.com/klauspost/compress v1.17.7 // indirect + github.com/klauspost/compress v1.17.8 // indirect github.com/minio/highwayhash v1.0.2 // indirect github.com/nats-io/jwt/v2 v2.5.5 // indirect github.com/nats-io/nkeys v0.4.7 // indirect diff --git a/tests/go/go.sum b/tests/go/go.sum index 2ea9a1e8..3f602201 100644 --- a/tests/go/go.sum +++ b/tests/go/go.sum @@ -1,5 +1,5 @@ -github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg= -github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= +github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g= github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= github.com/nats-io/jwt/v2 v2.5.5 h1:ROfXb50elFq5c9+1ztaUbdlrArNFl2+fQWP6B8HGEq4= diff --git a/tests/go/vendor_test.go b/tests/go/vendor_test.go deleted file mode 100644 index ec0221e1..00000000 --- a/tests/go/vendor_test.go +++ /dev/null @@ -1,6 +0,0 @@ -package integration_test - -// This is just here to let `go mod vendor` vendor things only used by the generated bindings -import ( - _ "golang.org/x/sync/errgroup" -)