From 27ad95603457ced68c33d0e5833e70c9063d2c5a Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Mon, 17 Aug 2015 21:57:29 +0200 Subject: [PATCH 1/4] More debug of the mac script --- tools/build-macos-script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build-macos-script.sh b/tools/build-macos-script.sh index ca3eec0d1..816d13b00 100755 --- a/tools/build-macos-script.sh +++ b/tools/build-macos-script.sh @@ -22,7 +22,7 @@ if [ "$REMOTE" = "origin/$TRAVIS_MAC_BRANCH" ]; then # Push (delete) remote branch on temote server (e.g. github) git push origin --delete "$TRAVIS_MAC_BRANCH" else - echo "No $TRAVIS_MAC_BRANCH to remove" + echo "$REMOTE : No $TRAVIS_MAC_BRANCH to remove" fi ## Create a new branch From e982ba50bea0d75893689944f8ab0582de450a13 Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Mon, 17 Aug 2015 22:27:39 +0200 Subject: [PATCH 2/4] Removed a suspicous $ from the mac script --- tools/build-macos-script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build-macos-script.sh b/tools/build-macos-script.sh index 816d13b00..f284c2fb5 100755 --- a/tools/build-macos-script.sh +++ b/tools/build-macos-script.sh @@ -14,7 +14,7 @@ git config --global user.email $GH_EMAIL git remote set-url origin "https://${GH_TOKEN}@github.com/WagicProject/wagic.git" ## Delete remote Travis-Mac branch (if any) -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 echo "Removing old $TRAVIS_MAC_BRANCH branch" # Delete remote branch From 19c96e496bf0e6510dc2c4d595f95a2ca734d07b Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Mon, 17 Aug 2015 23:03:53 +0200 Subject: [PATCH 3/4] More debug --- tools/build-macos-script.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/build-macos-script.sh b/tools/build-macos-script.sh index f284c2fb5..44d5df64b 100755 --- a/tools/build-macos-script.sh +++ b/tools/build-macos-script.sh @@ -14,7 +14,8 @@ git config --global user.email $GH_EMAIL git remote set-url origin "https://${GH_TOKEN}@github.com/WagicProject/wagic.git" ## Delete remote Travis-Mac branch (if any) -export REMOTE=(git branch -r | grep "origin/$TRAVIS_MAC_BRANCH") +echo git branches = `git branch -r` +export REMOTE=$(git branch -r | grep "origin/$TRAVIS_MAC_BRANCH") if [ "$REMOTE" = "origin/$TRAVIS_MAC_BRANCH" ]; then echo "Removing old $TRAVIS_MAC_BRANCH branch" # Delete remote branch From 62d42fb61f5f12e7fb4cfdf9ecf32dac9f8a42b9 Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Mon, 17 Aug 2015 23:53:11 +0200 Subject: [PATCH 4/4] Removed local check of mac branch --- tools/build-macos-script.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/build-macos-script.sh b/tools/build-macos-script.sh index 44d5df64b..09a75aa90 100755 --- a/tools/build-macos-script.sh +++ b/tools/build-macos-script.sh @@ -15,16 +15,16 @@ git remote set-url origin "https://${GH_TOKEN}@github.com/WagicProject/wagic.git ## Delete remote Travis-Mac branch (if any) echo git branches = `git branch -r` -export REMOTE=$(git branch -r | grep "origin/$TRAVIS_MAC_BRANCH") -if [ "$REMOTE" = "origin/$TRAVIS_MAC_BRANCH" ]; then - echo "Removing old $TRAVIS_MAC_BRANCH branch" - # Delete remote branch - git branch -r -D "origin/$TRAVIS_MAC_BRANCH" +#export REMOTE=$(git branch -r | grep "origin/$TRAVIS_MAC_BRANCH") +#if [ "$REMOTE" = "origin/$TRAVIS_MAC_BRANCH" ]; then +# echo "Removing old $TRAVIS_MAC_BRANCH branch" +# # Delete remote branch +# git branch -r -D "origin/$TRAVIS_MAC_BRANCH" # Push (delete) remote branch on temote server (e.g. github) git push origin --delete "$TRAVIS_MAC_BRANCH" -else - echo "$REMOTE : No $TRAVIS_MAC_BRANCH to remove" -fi +#else +# echo "$REMOTE : No $TRAVIS_MAC_BRANCH to remove" +#fi ## Create a new branch git checkout -q -b "$TRAVIS_MAC_BRANCH" "$TRAVIS_BRANCH"