From fe0c82a0433af86bbbb5ee7da8819b02379d0cfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=82=8E=E6=B3=BC?= Date: Sat, 19 Mar 2022 14:20:26 +0800 Subject: [PATCH] refactor: update gen-proto.sh for go 1.17 --- .github/workflows/test.yml | 42 ++++++++++++++++++++++ .travis.yml | 4 +-- Makefile | 3 +- gen-proto.sh | 5 +-- paxoskv/paxoskv.pb.go | 73 +++++++++++++++++++------------------- proto/paxoskv.proto | 7 +++- 6 files changed, 90 insertions(+), 44 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ac719b6..0e5c3a1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -33,3 +33,45 @@ jobs: - name: test run: go test -v ./... + + test_build_proto: + strategy: + matrix: + go-version: + - 1.14.x + - 1.15.x + - 1.16.x + - 1.17.x + os: [ubuntu-latest] + runs-on: ${{ matrix.os }} + steps: + - name: Install Go + uses: actions/setup-go@v3 + with: + go-version: ${{ matrix.go-version }} + + - name: checkout + uses: actions/checkout@v2 + + - name: cache + uses: actions/cache@v2 + with: + path: ~/go/pkg/mod + key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} + restore-keys: | + ${{ runner.os }}-go- + + - run: | + ./install-protoc.sh + # mac issue: need to add execute privilege + chmod +x bin/protoc + echo "$PWD/bin" >> $GITHUB_PATH + + - run: | + go get github.com/gogo/protobuf/protoc-gen-gogofaster@v1.3.2 + + - run: | + go env GOPATH + export GOPATH=$(go env GOPATH) + echo "GOPATH: ($GOPATH)" + ./gen-proto.sh diff --git a/.travis.yml b/.travis.yml index 690810d..b111702 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ jobs: - go: tip install: - ./install-protoc.sh - - go get github.com/golang/protobuf/protoc-gen-go + - go get github.com/gogo/protobuf/protoc-gen-gogofaster@v1.3.2 script: - - make gen + - ./gen-proto.sh - go test ./... diff --git a/Makefile b/Makefile index 6365c14..fdaa949 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,2 @@ gen: - # go get github.com/golang/protobuf/{proto,protoc-gen-go}@v1.2.0 - protoc --proto_path=proto --go_out=plugins=grpc:paxoskv paxoskv.proto + ./gen-proto.sh diff --git a/gen-proto.sh b/gen-proto.sh index cb3b682..b321e63 100755 --- a/gen-proto.sh +++ b/gen-proto.sh @@ -5,9 +5,10 @@ # go get github.com/gogo/protobuf/protoc-gen-gogofaster # go get github.com/gogo/protobuf/protoc-gen-gogoslick +echo "GOPATH: ($GOPATH)" + protoc -I=. \ - -I=$GOPATH/src \ - -I=$GOPATH/src/github.com/gogo/protobuf/protobuf \ + -I=$GOPATH/pkg/mod/github.com/gogo/protobuf@v1.3.2 \ --proto_path=proto \ --gogofaster_out=plugins=grpc:paxoskv \ paxoskv.proto diff --git a/paxoskv/paxoskv.pb.go b/paxoskv/paxoskv.pb.go index d4aa726..4fe74dd 100644 --- a/paxoskv/paxoskv.pb.go +++ b/paxoskv/paxoskv.pb.go @@ -322,43 +322,42 @@ func init() { func init() { proto.RegisterFile("paxoskv.proto", fileDescriptor_2fd9fc43023b527a) } var fileDescriptor_2fd9fc43023b527a = []byte{ - // 572 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x53, 0xcf, 0x6e, 0xd3, 0x4e, - 0x10, 0xce, 0x7a, 0xf3, 0xa7, 0x99, 0xf4, 0x17, 0x59, 0xa3, 0x9f, 0x90, 0x15, 0x60, 0xb1, 0x4c, - 0x55, 0x99, 0x7f, 0xa9, 0x48, 0x11, 0x42, 0x54, 0x1c, 0x68, 0x40, 0x60, 0x5a, 0xa5, 0x65, 0x2b, - 0xe5, 0xc0, 0xcd, 0x8d, 0x97, 0x52, 0xd5, 0xf6, 0x9a, 0xd8, 0xae, 0xc8, 0x0b, 0x70, 0xe6, 0x25, - 0x90, 0xfa, 0x14, 0x9c, 0x7b, 0xec, 0x91, 0x23, 0x4d, 0x1e, 0x80, 0x57, 0x40, 0xbb, 0x71, 0xd3, - 0x04, 0xa4, 0x72, 0xe3, 0xf6, 0xcd, 0x7e, 0x33, 0xdf, 0xcc, 0xe7, 0x19, 0xc3, 0x7f, 0x89, 0xff, - 0x49, 0xa6, 0x47, 0xc7, 0xed, 0x64, 0x28, 0x33, 0x89, 0xb5, 0x22, 0x6c, 0x3d, 0x38, 0x38, 0xcc, - 0x3e, 0xe4, 0xfb, 0xed, 0x81, 0x8c, 0xd6, 0x0e, 0xe4, 0x81, 0x5c, 0xd3, 0xfc, 0x7e, 0xfe, 0x5e, - 0x47, 0x3a, 0xd0, 0x68, 0x5a, 0xe7, 0xfc, 0x24, 0x50, 0xe3, 0xe2, 0x63, 0x2e, 0xd2, 0x0c, 0xaf, - 0x83, 0xb1, 0x93, 0x58, 0xc4, 0x26, 0x6e, 0xb3, 0xd3, 0x68, 0x5f, 0xe8, 0xef, 0x24, 0xdc, 0xd8, - 0x49, 0x70, 0x05, 0xe8, 0xa6, 0x1f, 0x5a, 0x15, 0x9b, 0xb8, 0x8d, 0x0e, 0xce, 0xd8, 0x4d, 0x3f, - 0x0c, 0x65, 0xd6, 0xcb, 0x23, 0xae, 0x68, 0xbc, 0x06, 0xd5, 0xae, 0x0c, 0xf3, 0x28, 0xb6, 0xc0, - 0x26, 0x2e, 0xe5, 0x45, 0x84, 0xcf, 0xa0, 0xee, 0xc5, 0x69, 0xe6, 0xc7, 0x03, 0x91, 0x5a, 0xff, - 0xdb, 0xd4, 0x6d, 0x74, 0x6e, 0xcd, 0x34, 0x8a, 0xfe, 0xed, 0x59, 0xc6, 0xcb, 0x38, 0x1b, 0x8e, - 0xf8, 0x65, 0x45, 0xeb, 0x0d, 0x34, 0x17, 0x49, 0x34, 0x81, 0x1e, 0x89, 0x91, 0x1e, 0x96, 0x72, - 0x05, 0xd1, 0x81, 0xca, 0xb1, 0x1f, 0xe6, 0xc2, 0x32, 0xf4, 0x88, 0xcb, 0x33, 0x79, 0x2f, 0x4e, - 0xf9, 0x94, 0x7a, 0x6a, 0x3c, 0x21, 0xce, 0x37, 0x02, 0x15, 0x2e, 0x92, 0x70, 0x84, 0xf7, 0xa1, - 0xb6, 0xed, 0xa7, 0xd9, 0xd5, 0xb6, 0x2e, 0x52, 0x70, 0xe3, 0x4f, 0x0b, 0x37, 0xe7, 0x2c, 0x24, - 0xe1, 0xe8, 0x1f, 0x19, 0xb8, 0x03, 0xf5, 0xd9, 0x78, 0xb8, 0x0c, 0xa4, 0x57, 0x88, 0x90, 0x1e, - 0x36, 0xc1, 0xf0, 0x02, 0x5d, 0x4f, 0xb9, 0xe1, 0x05, 0xce, 0x3d, 0xa0, 0xdd, 0x28, 0x50, 0xbd, - 0xb6, 0xc4, 0xc8, 0xa2, 0x36, 0x71, 0xeb, 0x5c, 0x41, 0x44, 0x28, 0xf7, 0x0f, 0x1f, 0x3f, 0xb2, - 0xca, 0x3a, 0x55, 0x63, 0xe7, 0x2d, 0x54, 0xbc, 0x38, 0xf5, 0x82, 0xb9, 0x25, 0x92, 0x85, 0x25, - 0x9a, 0x40, 0xb7, 0xf7, 0x7a, 0xfa, 0x5b, 0x51, 0xae, 0x20, 0x32, 0x80, 0xdd, 0xa1, 0x4c, 0x64, - 0x2a, 0x86, 0x5e, 0x50, 0xac, 0x7c, 0xee, 0xc5, 0xf9, 0x4a, 0x80, 0x7a, 0x71, 0x8a, 0x2b, 0x85, - 0xb4, 0x16, 0x6c, 0x74, 0x9a, 0xf3, 0xd6, 0xbc, 0x80, 0x17, 0x7d, 0x19, 0xd0, 0xbe, 0x1f, 0xea, - 0x31, 0xe7, 0xed, 0x77, 0xa3, 0x80, 0x2b, 0x02, 0x57, 0xa1, 0xdc, 0xbf, 0x7a, 0x59, 0x9a, 0x57, - 0xe6, 0x5e, 0x88, 0x24, 0xb5, 0xaa, 0x36, 0x55, 0xe6, 0x14, 0xc6, 0x1b, 0x50, 0xef, 0xca, 0x28, - 0x3a, 0xcc, 0x32, 0x11, 0x58, 0x35, 0x9b, 0xb8, 0x4b, 0xfc, 0xf2, 0xe1, 0xee, 0xaa, 0xba, 0x7c, - 0x5c, 0x82, 0x72, 0x4f, 0xca, 0xc4, 0x2c, 0x21, 0x40, 0xf5, 0xf9, 0x60, 0x20, 0x92, 0xcc, 0x24, - 0x0a, 0x4f, 0x13, 0x4d, 0xa3, 0xf3, 0x99, 0x40, 0x6d, 0x57, 0x75, 0xdd, 0xea, 0xe3, 0x43, 0x68, - 0xbc, 0xf6, 0xe3, 0x20, 0x14, 0xfa, 0x01, 0xcd, 0xdf, 0xcf, 0xb9, 0xd5, 0x5c, 0xbc, 0x0e, 0xa7, - 0x84, 0xb7, 0x81, 0xee, 0x89, 0x0c, 0x17, 0xac, 0xb5, 0x16, 0xa2, 0x69, 0xd2, 0xab, 0xbf, 0x25, - 0x6d, 0xae, 0x9f, 0x9e, 0xb3, 0xd2, 0xd9, 0x39, 0x23, 0x27, 0x63, 0x46, 0x4e, 0xc7, 0x8c, 0x9c, - 0x8d, 0x19, 0xf9, 0x31, 0x66, 0xe4, 0xcb, 0x84, 0x95, 0x4e, 0x26, 0x8c, 0x9c, 0x4d, 0x58, 0xe9, - 0xfb, 0x84, 0x95, 0xde, 0xd5, 0xdb, 0x1b, 0x45, 0xe9, 0x7e, 0x55, 0xff, 0xf2, 0xeb, 0xbf, 0x02, - 0x00, 0x00, 0xff, 0xff, 0x15, 0x88, 0x7f, 0x1f, 0x3b, 0x04, 0x00, 0x00, + // 556 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x53, 0xcd, 0x6e, 0xd3, 0x4c, + 0x14, 0xf5, 0x78, 0xf2, 0xd3, 0xdc, 0xf4, 0x8b, 0xac, 0xab, 0xea, 0x93, 0x15, 0x60, 0xb0, 0x4c, + 0x55, 0x99, 0x1f, 0x05, 0x91, 0x22, 0x84, 0xa8, 0x58, 0xd0, 0x80, 0xc0, 0xb4, 0x4a, 0xca, 0x54, + 0xca, 0x82, 0x9d, 0x89, 0x47, 0x55, 0x55, 0xdb, 0x63, 0x62, 0xa7, 0x22, 0x2f, 0xc0, 0x9a, 0x97, + 0x40, 0xea, 0x53, 0xb0, 0xee, 0x32, 0x4b, 0x96, 0x34, 0x79, 0x00, 0x5e, 0x01, 0xcd, 0xc4, 0x4d, + 0x13, 0x90, 0xca, 0x8e, 0xdd, 0x99, 0x7b, 0xce, 0x9c, 0x7b, 0x8f, 0xef, 0x18, 0xfe, 0x4b, 0x83, + 0x4f, 0x32, 0x3b, 0x39, 0x6d, 0xa5, 0x43, 0x99, 0x4b, 0xac, 0x16, 0xc7, 0xe6, 0xc6, 0x91, 0x3c, + 0x92, 0xba, 0xf6, 0x50, 0xa1, 0x39, 0xed, 0xfe, 0x24, 0x50, 0xe5, 0xe2, 0xe3, 0x48, 0x64, 0x39, + 0xde, 0x00, 0xb3, 0x97, 0xda, 0xc4, 0x21, 0x5e, 0xa3, 0x5d, 0x6f, 0x5d, 0xda, 0xf4, 0x52, 0x6e, + 0xf6, 0x52, 0xdc, 0x04, 0xba, 0x1b, 0x44, 0x76, 0xd9, 0x21, 0x5e, 0xbd, 0x8d, 0x0b, 0x76, 0x37, + 0x88, 0x22, 0x99, 0x77, 0x47, 0x31, 0x57, 0x34, 0xfe, 0x0f, 0x95, 0x8e, 0x8c, 0x46, 0x71, 0x62, + 0x83, 0x43, 0x3c, 0xca, 0x8b, 0x13, 0x3e, 0x87, 0x9a, 0x9f, 0x64, 0x79, 0x90, 0x0c, 0x44, 0x66, + 0x6f, 0x38, 0xd4, 0xab, 0xb7, 0x6f, 0x2f, 0x3c, 0x8a, 0xfe, 0xad, 0x85, 0xe2, 0x55, 0x92, 0x0f, + 0xc7, 0xfc, 0xea, 0x46, 0xf3, 0x2d, 0x34, 0x56, 0x49, 0xb4, 0x80, 0x9e, 0x88, 0xb1, 0x1e, 0x96, + 0x72, 0x05, 0xd1, 0x85, 0xf2, 0x69, 0x10, 0x8d, 0x84, 0x6d, 0xea, 0x11, 0xd7, 0x17, 0xf6, 0x7e, + 0x92, 0xf1, 0x39, 0xf5, 0xcc, 0x7c, 0x4a, 0xdc, 0x6f, 0x04, 0xca, 0x5c, 0xa4, 0xd1, 0x18, 0x1f, + 0x40, 0x75, 0x3f, 0xc8, 0xf2, 0xeb, 0x63, 0x5d, 0x4a, 0x70, 0xe7, 0xcf, 0x08, 0xb7, 0x96, 0x22, + 0xa4, 0xd1, 0xf8, 0x1f, 0x05, 0xb8, 0x0b, 0xb5, 0xc5, 0x78, 0xb8, 0x0e, 0xa4, 0x5b, 0x98, 0x90, + 0x2e, 0x36, 0xc0, 0xf4, 0x43, 0x7d, 0x9f, 0x72, 0xd3, 0x0f, 0xdd, 0xfb, 0x40, 0x3b, 0x71, 0xa8, + 0x7a, 0xed, 0x89, 0xb1, 0x4d, 0x1d, 0xe2, 0xd5, 0xb8, 0x82, 0x88, 0x50, 0xea, 0x1f, 0x3f, 0x79, + 0x6c, 0x97, 0xb4, 0x54, 0x63, 0xf7, 0x1d, 0x94, 0xfd, 0x24, 0xf3, 0xc3, 0xa5, 0x25, 0x92, 0x95, + 0x25, 0x5a, 0x40, 0xf7, 0x0f, 0xbb, 0xfa, 0x5b, 0x51, 0xae, 0x20, 0x32, 0x80, 0x83, 0xa1, 0x4c, + 0x65, 0x26, 0x86, 0x7e, 0x58, 0xac, 0x7c, 0xa9, 0xe2, 0x7e, 0x25, 0x40, 0xfd, 0x24, 0xc3, 0xcd, + 0xc2, 0x5a, 0x1b, 0xd6, 0xdb, 0x8d, 0xe5, 0x68, 0x7e, 0xc8, 0x8b, 0xbe, 0x0c, 0x68, 0x3f, 0x88, + 0xf4, 0x98, 0xcb, 0xf1, 0x3b, 0x71, 0xc8, 0x15, 0x81, 0x5b, 0x50, 0xea, 0x5f, 0xbf, 0x2c, 0xcd, + 0xab, 0x70, 0x2f, 0x45, 0x9a, 0xd9, 0x15, 0x87, 0xaa, 0x70, 0x0a, 0xe3, 0x4d, 0xa8, 0x75, 0x64, + 0x1c, 0x1f, 0xe7, 0xb9, 0x08, 0xed, 0xaa, 0x43, 0xbc, 0x35, 0x7e, 0x55, 0xb8, 0xb7, 0xa5, 0x5e, + 0x3e, 0xae, 0x41, 0xa9, 0x2b, 0x65, 0x6a, 0x19, 0x08, 0x50, 0x79, 0x31, 0x18, 0x88, 0x34, 0xb7, + 0x88, 0xc2, 0x73, 0xa1, 0x65, 0xb6, 0x3f, 0x13, 0xa8, 0x1e, 0xa8, 0xae, 0x7b, 0x7d, 0x7c, 0x04, + 0xf5, 0x37, 0x41, 0x12, 0x46, 0x42, 0x17, 0xd0, 0xfa, 0xfd, 0x39, 0x37, 0x1b, 0xab, 0xaf, 0xc3, + 0x35, 0xf0, 0x0e, 0xd0, 0x43, 0x91, 0xe3, 0x4a, 0xb4, 0xe6, 0xca, 0x69, 0x2e, 0x7a, 0xfd, 0x37, + 0xd1, 0xee, 0xf6, 0xf9, 0x05, 0x33, 0x26, 0x17, 0x8c, 0x9c, 0x4d, 0x19, 0x39, 0x9f, 0x32, 0x32, + 0x99, 0x32, 0xf2, 0x63, 0xca, 0xc8, 0x97, 0x19, 0x33, 0xce, 0x66, 0x8c, 0x4c, 0x66, 0xcc, 0xf8, + 0x3e, 0x63, 0xc6, 0xfb, 0x5a, 0x6b, 0xa7, 0xb8, 0xfa, 0xa1, 0xa2, 0x7f, 0xf9, 0xed, 0x5f, 0x01, + 0x00, 0x00, 0xff, 0xff, 0xc3, 0xf7, 0xf8, 0x81, 0x22, 0x04, 0x00, 0x00, } func (this *Request) Compare(that interface{}) int { diff --git a/proto/paxoskv.proto b/proto/paxoskv.proto index 813f692..6a375c9 100644 --- a/proto/paxoskv.proto +++ b/proto/paxoskv.proto @@ -3,7 +3,12 @@ syntax = "proto3"; package paxoskv; option go_package = ".;paxoskv"; -import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +// Go Modules now includes the version in the filepath for packages within GOPATH/pkg/mode +// Therefore unless we want to hardcode a version here like +// github.com/gogo/protobuf@v1.3.0/gogoproto/gogo.proto then the only other choice is to +// have a more relative import and pass the right import path to protoc. I don't like it +// but its necessary. +import "gogoproto/gogo.proto"; option (gogoproto.equal_all) = true; option (gogoproto.compare_all) = true;