Skip to content

[to #591] update all the branch of proto while precompiling to avoid commit miss #598

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

Merged
zz-jason merged 5 commits into from
Apr 24, 2022
Merged

[to #591] update all the branch of proto while precompiling to avoid commit miss #598

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c43a8d4
update all the branch of proto while precompiling to avoid commit miss
iosmanthus Apr 22, 2022
8cb4405
refactor proto.sh, removing redundent code
iosmanthus Apr 24, 2022
efdd380
add new line
iosmanthus Apr 24, 2022
32e2f61
resolve conflicts
iosmanthus Apr 24, 2022
ad4164c
try to use bash
iosmanthus Apr 24, 2022
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
54 changes: 19 additions & 35 deletions dev/proto.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,43 +14,27 @@
# limitations under the License.
#

kvproto_hash=58f2ac94aa38f49676dd628fbcc1d669a77a62ac
raft_rs_hash=b9891b673573fad77ebcf9bbe0969cf945841926
tipb_hash=c4d518eb1d60c21f05b028b36729e64610346dac
proto_dir="proto"

kvproto_dir="kvproto"
raft_rs_dir="raft-rs"
tipb_dir="tipb"

CURRENT_DIR=$(pwd)
TIKV_CLIENT_HOME="$(
cd "$(dirname "$0")"/.. || exit
pwd
)"
cd "$TIKV_CLIENT_HOME" || exit

if [ -d "$kvproto_dir" ]; then
git -C ${kvproto_dir} fetch -p
git pull --all
else
git clone https://github.com/pingcap/kvproto ${kvproto_dir}
if [ -d $proto_dir ]; then
rm -r $proto_dir
fi
git -C ${kvproto_dir} checkout ${kvproto_hash}

if [ -d "$raft_rs_dir" ]; then
git -C ${raft_rs_dir} fetch -p
git pull --all
else
git clone https://github.com/pingcap/raft-rs ${raft_rs_dir}
fi
git -C ${raft_rs_dir} checkout ${raft_rs_hash}
repos=("https://github.com/pingcap/kvproto" "https://github.com/pingcap/raft-rs" "https://github.com/pingcap/tipb")
commits=(58f2ac94aa38f49676dd628fbcc1d669a77a62ac b9891b673573fad77ebcf9bbe0969cf945841926 c4d518eb1d60c21f05b028b36729e64610346dac)

if [ -d "$tipb_dir" ]; then
git -C ${tipb_dir} fetch -p
git pull --all
else
git clone https://github.com/pingcap/tipb ${tipb_dir}
fi
git -C ${tipb_dir} checkout ${tipb_hash}
for i in "${!repos[@]}"; do
repo_name=$(basename ${repos[$i]})
git_command="git -C $repo_name"

if [ -d "$repo_name" ]; then
$git_command checkout `basename $($git_command symbolic-ref --short refs/remotes/origin/HEAD)`
$git_command fetch --all
$git_command pull --all
else
git clone ${repos[$i]} $repo_name
$git_command fetch -p
fi

cd "$CURRENT_DIR" || exit
$git_command checkout ${commits[$i]}
done