Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'WagicProject/master'

Browse Source
This commit is contained in:
Anthony Calosa
2015-08-20 23:09:12 +08:00
parent 26ecb199d3 62d42fb61f
commit 5a2637856f
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/build-macos-script.sh
+9 -8
View File
@@ -14,16 +14,17 @@ git config --global user.email $GH_EMAIL
git remote set-url origin "https://${GH_TOKEN}@github.com/WagicProject/wagic.git" git remote set-url origin "https://${GH_TOKEN}@github.com/WagicProject/wagic.git"
## Delete remote Travis-Mac branch (if any) ## Delete remote Travis-Mac branch (if any)
export REMOTE=$(git branch -r | grep "origin/$TRAVIS_MAC_BRANCH") echo git branches = `git branch -r`
if [ "$REMOTE" = "origin/$TRAVIS_MAC_BRANCH" ]; then #export REMOTE=$(git branch -r | grep "origin/$TRAVIS_MAC_BRANCH")
echo "Removing old $TRAVIS_MAC_BRANCH branch" #if [ "$REMOTE" = "origin/$TRAVIS_MAC_BRANCH" ]; then
# Delete remote branch # echo "Removing old $TRAVIS_MAC_BRANCH branch"
git branch -r -D "origin/$TRAVIS_MAC_BRANCH" # # Delete remote branch
# git branch -r -D "origin/$TRAVIS_MAC_BRANCH"
# Push (delete) remote branch on temote server (e.g. github) # Push (delete) remote branch on temote server (e.g. github)
git push origin --delete "$TRAVIS_MAC_BRANCH" git push origin --delete "$TRAVIS_MAC_BRANCH"
else #else
echo "No $TRAVIS_MAC_BRANCH to remove" # echo "$REMOTE : No $TRAVIS_MAC_BRANCH to remove"
fi #fi
## Create a new branch ## Create a new branch
git checkout -q -b "$TRAVIS_MAC_BRANCH" "$TRAVIS_BRANCH" git checkout -q -b "$TRAVIS_MAC_BRANCH" "$TRAVIS_BRANCH"