fix 2.2 branch use master branch proto (#21914)

Signed-off-by: Wei Liu <wei.liu@zilliz.com>
pull/21941/head
wei liu 2023-02-02 14:55:53 +08:00 committed by GitHub
parent d3919157d2
commit 4fa8b90141
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions

2
go.sum
View File

@ -490,8 +490,6 @@ github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyex
github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
github.com/milvus-io/gorocksdb v0.0.0-20220624081344-8c5f4212846b h1:TfeY0NxYxZzUfIfYe5qYDBzt4ZYRqzUjTR6CvUzjat8=
github.com/milvus-io/gorocksdb v0.0.0-20220624081344-8c5f4212846b/go.mod h1:iwW+9cWfIzzDseEBCCeDSN5SD16Tidvy8cwQ7ZY8Qj4=
github.com/milvus-io/milvus-proto/go-api v0.0.0-20230131092640-7aebd990ebac h1:RNEjVzLuE3XQQVzfdt/YOEtqXoM5JnA0sSw58ES0MoI=
github.com/milvus-io/milvus-proto/go-api v0.0.0-20230131092640-7aebd990ebac/go.mod h1:148qnlmZ0Fdm1Fq+Mj/OW2uDoEP25g3mjh0vMGtkgmk=
github.com/milvus-io/milvus-proto/go-api v0.0.0-20230131100146-10289a199a32 h1:cLW/zBbJQWNtux+Cjx4RniB70iw3T5ut8/D393YNtz0=
github.com/milvus-io/milvus-proto/go-api v0.0.0-20230131100146-10289a199a32/go.mod h1:148qnlmZ0Fdm1Fq+Mj/OW2uDoEP25g3mjh0vMGtkgmk=
github.com/milvus-io/pulsar-client-go v0.6.8 h1:fZdZH73aPRszu2fazyeeahQEz34tyn1Pt9EkqJmV100=

View File

@ -7,7 +7,7 @@ function line()
line
echo "Update the milvus-proto/api version"
commitID=$(git ls-remote https://github.com/milvus-io/milvus-proto.git refs/heads/master | cut -f 1)
commitID=$(git ls-remote https://github.com/milvus-io/milvus-proto.git refs/heads/2.2 | cut -f 1)
go get github.com/milvus-io/milvus-proto/go-api@$commitID
SCRIPTS_DIR=$(dirname "$0")
@ -19,6 +19,6 @@ line echo "Update the milvus-proto repo"
THIRD_PARTY_DIR=$SCRIPTS_DIR/../cmake_build/thirdparty
pushd $THIRD_PARTY_DIR/milvus-proto
git checkout master
git pull origin master
git checkout 2.2
git pull origin 2.2
popd