From 9b42b7b38df981d38f063b97f74dfb9c66b16f86 Mon Sep 17 00:00:00 2001 From: Dominik Schilling Date: Wed, 15 Mar 2017 22:39:28 +0100 Subject: [PATCH 1/2] Update dev-lib --- .travis.yml | 14 +++++++++++--- dev-lib | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 594652a99..8dc87b9a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,21 @@ sudo: false -language: - - php +notifications: + email: + on_success: never + on_failure: change -## Cache composer bits cache: directories: + - node_modules - vendor + - $HOME/phpunit-bin - $HOME/.composer/cache +language: + - php + - node_js + matrix: allow_failures: - php: hhvm @@ -36,6 +43,7 @@ matrix: env: WP_VERSION=trunk WP_MULTISITE=0 install: + - nvm install 6 && nvm use 6 - export DEV_LIB_PATH=dev-lib - if [ ! -e "$DEV_LIB_PATH" ] && [ -L .travis.yml ]; then export DEV_LIB_PATH=$( dirname $( readlink .travis.yml ) ); fi - if [ ! -e "$DEV_LIB_PATH" ]; then git clone https://github.com/xwp/wp-dev-lib.git $DEV_LIB_PATH; fi diff --git a/dev-lib b/dev-lib index 0c6ee6b87..412beec46 160000 --- a/dev-lib +++ b/dev-lib @@ -1 +1 @@ -Subproject commit 0c6ee6b87b00b28da2c8016cecbb8d5ade06dd62 +Subproject commit 412beec4607e833b7e338ea444da2a545c4ad6e8 From f7939418e28cbf2dd7c30a1a2bd2fd96a6fc682d Mon Sep 17 00:00:00 2001 From: Dominik Schilling Date: Wed, 15 Mar 2017 22:51:12 +0100 Subject: [PATCH 2/2] Travis: Remove Xdebug for a huge performance increase, but not from nightly or hhvm --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index 8dc87b9a3..70ab4cc5e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,6 +49,14 @@ install: - if [ ! -e "$DEV_LIB_PATH" ]; then git clone https://github.com/xwp/wp-dev-lib.git $DEV_LIB_PATH; fi - source $DEV_LIB_PATH/travis.install.sh +before_script: + - | + # Remove Xdebug for a huge performance increase, but not from nightly or hhvm: + stable='^[0-9\.]+$' + if [[ "$TRAVIS_PHP_VERSION" =~ $stable ]]; then + phpenv config-rm xdebug.ini + fi + script: - source $DEV_LIB_PATH/travis.script.sh