Skip to content

[close #591] update all the branch of proto while precompiling to avoid commit miss (#592) #593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ti-srebot wants to merge 1 commit into from
Closed

[close #591] update all the branch of proto while precompiling to avoid commit miss (#592) #593

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions dev/proto.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,38 @@ raft_rs_hash=b9891b673573fad77ebcf9bbe0969cf945841926

tipb_hash=c4d518eb1d60c21f05b028b36729e64610346dac

<<<<<<< HEAD
if [ -d "kvproto" ]; then
cd kvproto; git fetch -p; git checkout ${kvproto_hash}; cd ..
=======
if [ -d "$kvproto_dir" ]; then
git -C ${kvproto_dir} fetch -p
git pull --all
>>>>>>> 7a123a07e... [close #591] update all the branch of proto while precompiling to avoid commit miss (#592)
else
git clone https://github.com/pingcap/kvproto; cd kvproto; git checkout ${kvproto_hash}; cd ..
fi

<<<<<<< HEAD
if [ -d "raft-rs" ]; then
cd raft-rs; git fetch -p; git checkout ${raft_rs_hash}; cd ..
=======
if [ -d "$raft_rs_dir" ]; then
git -C ${raft_rs_dir} fetch -p
git pull --all
>>>>>>> 7a123a07e... [close #591] update all the branch of proto while precompiling to avoid commit miss (#592)
else
git clone https://github.com/pingcap/raft-rs; cd raft-rs; git checkout ${raft_rs_hash}; cd ..
fi

<<<<<<< HEAD
if [ -d "tipb" ]; then
cd tipb; git fetch -p; git checkout ${tipb_hash}; cd ..
=======
if [ -d "$tipb_dir" ]; then
git -C ${tipb_dir} fetch -p
git pull --all
>>>>>>> 7a123a07e... [close #591] update all the branch of proto while precompiling to avoid commit miss (#592)
else
git clone https://github.com/pingcap/tipb; cd tipb; git checkout ${tipb_hash}; cd ..
fi
Expand Down