OrgGo
/
Mainflux.mainflux
mirror of https://github.com/mainflux/mainflux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix CI with fixed plugin versions (#747) 

Signed-off-by: Aleksandar Novakovic <anovakovic01@gmail.com>
This commit is contained in:
Aleksandar Novaković 2019-05-15 17:41:18 +02:00 committed by Drasko DRASKOVIC
parent f5bb65d0e4
commit cc5c66bfba
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
message.pb.go
View File

@ -585,9 +585,9 @@ func (m *Message) MarshalTo(dAtA []byte) (int, error) {
i += copy(dAtA[i:], m.Unit)
}
if m.Value != nil {
nn1, err1 := m.Value.MarshalTo(dAtA[i:])
if err1 != nil {
return 0, err1
nn1, err := m.Value.MarshalTo(dAtA[i:])
if err != nil {
return 0, err
}
i += nn1
}
@ -595,9 +595,9 @@ func (m *Message) MarshalTo(dAtA []byte) (int, error) {
dAtA[i] = 0x5a
i++
i = encodeVarintMessage(dAtA, i, uint64(m.ValueSum.Size()))
n2, err2 := m.ValueSum.MarshalTo(dAtA[i:])
if err2 != nil {
return 0, err2
n2, err := m.ValueSum.MarshalTo(dAtA[i:])
if err != nil {
return 0, err
}
i += n2
}

12
scripts/ci.sh
View File

@ -12,6 +12,16 @@ setup_protoc() {
go get -u github.com/golang/protobuf/protoc-gen-go \
github.com/gogo/protobuf/protoc-gen-gofast \
google.golang.org/grpc
git -C $GOPATH/src/github.com/golang/protobuf/protoc-gen-go checkout v1.3.1
go install github.com/golang/protobuf/protoc-gen-go
git -C $GOPATH/src/github.com/gogo/protobuf/protoc-gen-gofast checkout v1.2.1
go install github.com/gogo/protobuf/protoc-gen-gofast
git -C $GOPATH/src/google.golang.org/grpc checkout v1.20.1
go install google.golang.org/grpc
export PATH=$PATH:/usr/local/bin/protoc
}
@ -29,7 +39,7 @@ setup_mf() {
make proto
for p in $(ls *.pb.go); do
if ! cmp -s $p $p.tmp; then
echo "Proto file and generated Go file $p are out of cync!"
echo "Proto file and generated Go file $p are out of sync!"
exit 1
fi
done