Commit 82ec98b3 authored by captainwong's avatar captainwong

fix git

parent cffbe981
...@@ -7,9 +7,10 @@ CURRENT_DIR=$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P ) ...@@ -7,9 +7,10 @@ CURRENT_DIR=$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P )
cd $CURRENT_DIR cd $CURRENT_DIR
ssh -t ${LINUX_TARGET} <<EOF ssh -t ${LINUX_TARGET} <<EOF
cd ${LINUX_PROJECT_PATH} cd ${LINUX_PROJECT_PATH}
git reset --hard HEAD
git pull
git checkout ${PROJECT_BRANCH} git checkout ${PROJECT_BRANCH}
git reset --hard HEAD git pull
git pull origin ${PROJECT_BRANCH}
cd swig cd swig
export JAVA_HOME=${LINUX_JAVA_HOME} export JAVA_HOME=${LINUX_JAVA_HOME}
./linux_java.sh ./linux_java.sh
......
...@@ -7,9 +7,10 @@ cd $CURRENT_DIR ...@@ -7,9 +7,10 @@ cd $CURRENT_DIR
ssh -t ${LINUX_TARGET} <<EOF ssh -t ${LINUX_TARGET} <<EOF
cd ${LINUX_PROJECT_PATH} cd ${LINUX_PROJECT_PATH}
git reset --hard HEAD
git pull
git checkout ${PROJECT_BRANCH} git checkout ${PROJECT_BRANCH}
git reset --hard HEAD git pull
git pull origin ${PROJECT_BRANCH}
cd swig cd swig
./linux_mac_node.sh ./linux_mac_node.sh
cd ../tools cd ../tools
......
...@@ -7,9 +7,10 @@ CURRENT_DIR=$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P ) ...@@ -7,9 +7,10 @@ CURRENT_DIR=$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P )
cd $CURRENT_DIR cd $CURRENT_DIR
ssh -t ${MACOS_TARGET} <<EOF ssh -t ${MACOS_TARGET} <<EOF
cd ${MACOS_PROJECT_PATH} cd ${MACOS_PROJECT_PATH}
git checkout ${PROJECT_BRANCH}
git reset --hard HEAD git reset --hard HEAD
git pull origin ${PROJECT_BRANCH} git pull
git checkout ${PROJECT_BRANCH}
git pull
cd swig cd swig
./mac_java.sh ./mac_java.sh
cd ../tools cd ../tools
......
...@@ -7,9 +7,10 @@ cd $CURRENT_DIR ...@@ -7,9 +7,10 @@ cd $CURRENT_DIR
ssh -t ${MACOS_TARGET} <<EOF ssh -t ${MACOS_TARGET} <<EOF
cd ${LINUX_PROJECT_PATH} cd ${LINUX_PROJECT_PATH}
git reset --hard HEAD
git pull
git checkout ${PROJECT_BRANCH} git checkout ${PROJECT_BRANCH}
git reset --hard HEAD git pull
git pull origin ${PROJECT_BRANCH}
cd swig cd swig
./linux_mac_node.sh ./linux_mac_node.sh
cd ../tools cd ../tools
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment