diff --git a/.travis.yml b/.travis.yml index 7a642a4544..e05a986c76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,9 +13,9 @@ matrix: - php: 5.5 env: WP_VERSION=3.4.2 -before_script: ./bin/ci/install_dependencies.sh +before_script: ./bin/ci/prepare.sh -script: ./bin/ci/run_build.sh +script: ./bin/ci/build.sh notifications: email: diff --git a/bin/ci/run_build.sh b/bin/ci/build.sh similarity index 79% rename from bin/ci/run_build.sh rename to bin/ci/build.sh index f3cd75e8e8..1dd2c52e29 100755 --- a/bin/ci/run_build.sh +++ b/bin/ci/build.sh @@ -2,15 +2,15 @@ set -ex +# Run the unit tests phpunit -# Run the functional tests against the Phar file - +# Create the Phar file WP_CLI_BIN_DIR=/tmp/wp-cli-phar - mkdir -p $WP_CLI_BIN_DIR php -dphar.readonly=0 utils/make-phar.php wp-cli.phar --quiet mv wp-cli.phar $WP_CLI_BIN_DIR/wp chmod +x $WP_CLI_BIN_DIR/wp +# Run the functional tests WP_CLI_BIN_DIR=$WP_CLI_BIN_DIR php behat.phar --format progress diff --git a/bin/ci/install_dependencies.sh b/bin/ci/prepare.sh similarity index 100% rename from bin/ci/install_dependencies.sh rename to bin/ci/prepare.sh