Removed local check of mac branch

This commit is contained in:
Xawotihs
2015-08-17 23:53:11 +02:00
parent 19c96e496b
commit 62d42fb61f

View File

@@ -15,16 +15,16 @@ 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)
echo git branches = `git branch -r` echo git branches = `git branch -r`
export REMOTE=$(git branch -r | grep "origin/$TRAVIS_MAC_BRANCH") #export REMOTE=$(git branch -r | grep "origin/$TRAVIS_MAC_BRANCH")
if [ "$REMOTE" = "origin/$TRAVIS_MAC_BRANCH" ]; then #if [ "$REMOTE" = "origin/$TRAVIS_MAC_BRANCH" ]; then
echo "Removing old $TRAVIS_MAC_BRANCH branch" # echo "Removing old $TRAVIS_MAC_BRANCH branch"
# Delete remote branch # # Delete remote branch
git branch -r -D "origin/$TRAVIS_MAC_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 "$REMOTE : 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"