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:00:56 +08:00
parent baa90fb605 8c6f694645
commit 26ecb199d3
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
appveyor.yml
View File

@@ -9,6 +9,9 @@ branches:
# blacklist # blacklist
except: except:
- travis_mac_osx - travis_mac_osx
# Do not build on tags (GitHub only)
skip_tags: true
#---------------------------------# #---------------------------------#
# environment configuration # # environment configuration #
#---------------------------------# #---------------------------------#

10
tools/build-macos-script.sh
View File

@@ -14,10 +14,15 @@ 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\$") export REMOTE=$(git branch -r | grep "origin/$TRAVIS_MAC_BRANCH")
if test -n "$REMOTE" ; then 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) # 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
echo "No $TRAVIS_MAC_BRANCH to remove"
fi fi
## Create a new branch ## Create a new branch
@@ -26,7 +31,6 @@ git checkout -q -b "$TRAVIS_MAC_BRANCH" "$TRAVIS_BRANCH"
## Write a new Travis-CI configuration file ## Write a new Travis-CI configuration file
cp tools/macos.travis.yml .travis.yml cp tools/macos.travis.yml .travis.yml
git add .travis.yml git add .travis.yml
git rm appveyor.yml
git commit -m "Auto-Updated Travis-CI configuration for Mac" git commit -m "Auto-Updated Travis-CI configuration for Mac"
## Push new branch to remote server ## Push new branch to remote server
git push -q origin $TRAVIS_MAC_BRANCH:$TRAVIS_MAC_BRANCH 2> /dev/null > /dev/null git push -q origin $TRAVIS_MAC_BRANCH:$TRAVIS_MAC_BRANCH 2> /dev/null > /dev/null