|
|
@@ -1,11 +1,11 @@
|
|
|
#!/bin/bash
|
|
|
|
|
|
# 更新代码
|
|
|
-cd /code && git pull || git reset --hard FETCH_HEAD
|
|
|
+cd /code && git fetch origin $PROGINN_BRANCH
|
|
|
cd /code && git checkout -f origin/$PROGINN_BRANCH
|
|
|
-cd /boss && git pull || git reset --hard FETCH_HEAD
|
|
|
+cd /boss && git fetch origin $ROOTER_BRANCH
|
|
|
cd /boss && git checkout -f origin/$ROOTER_BRANCH
|
|
|
-cd /proginn-frontend && git pull || git reset --hard FETCH_HEAD
|
|
|
+cd /proginn-frontend && git fetch origin $PROGINN_FRONTEND_BRANCH
|
|
|
cd /proginn-frontend && git checkout -f origin/$PROGINN_FRONTEND_BRANCH
|
|
|
cd /proginn-frontend && current_git_branch_latest_id=`git rev-parse HEAD`
|
|
|
current_git_branch_last_id=`cat /var/www/.proginn-frontend-commit-id`
|