Update our CI to new travis infrastructure and grab remote changes be…

…fore merge
kalamuna · Oct 3, 2015 · 8502882 · 8502882
1 parent fdf939c
commit 8502882
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,5 @@
 language: php
+sudo: false
 php:
 - 5.3
 before_install:

diff --git a/ci/travis-ci.sh b/ci/travis-ci.sh
@@ -70,6 +70,8 @@ after-success() {
     git remote rm origin
     git remote add origin [email protected]:kalamuna/playbox.git
     git checkout $TRAVIS_BRANCH
+    # Pull in any remote changes
+    git pull upstream $TRAVIS_BRANCH
     #git commit -m "KALABOT MERGING COMMIT ${TRAVIS_COMMIT} FROM ${TRAVIS_REPO_SLUG} [ci skip]" --amend --author="Kala C. Bot <[email protected]>" --no-verify
     #git push origin $TRAVIS_BRANCH -f
     git push upstream $TRAVIS_BRANCH