Merge remote-tracking branch 'origin/master'

This commit is contained in:
tritoch
2017-06-13 15:25:28 -05:00
2 changed files with 14 additions and 2 deletions

View File

@@ -24,7 +24,7 @@ pip install -r requirements.txt
```
### Usage ###
```
$> python main.py
```

View File

@@ -31,7 +31,19 @@ cd ..
rm -rf out/**/* || exit 0
# Run our compile script
doCompile
#doCompile
echo TRAVIS_PULL_REQUEST ${TRAVIS_PULL_REQUEST}
echo TRAVIS_SECURE_ENV_VARS ${TRAVIS_SECURE_ENV_VARS}
echo TRAVIS_EVENT_TYPE ${TRAVIS_EVENT_TYPE}
# Don't push to our branch for PRs.
if [ "${ghToken:-false}" != "false" ]; then
doCompile
else
doCompile
exit 0
fi
# Now let's go have some fun with the cloned repo
cd out