diff --git a/.travis.yml b/.travis.yml index 817b6cb71081c..41c7d0c21f50c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,35 +40,50 @@ jobs: - npm run ci || exit 1 - stage: test - env: WP_VERSION=latest DOCKER=true + env: + WP_VERSION=latest + DOCKER=true + SKIP_POSTINSTALL=true script: - ./bin/run-wp-unit-tests.sh - stage: test php: 5.6 - env: WP_VERSION=latest + env: + WP_VERSION=latest + SKIP_POSTINSTALL=true script: - ./bin/run-wp-unit-tests.sh if: branch = master and type != "pull_request" - stage: test php: 7.1 - env: WP_VERSION=latest SWITCH_TO_PHP=5.3 + env: + WP_VERSION=latest + SWITCH_TO_PHP=5.3 + SKIP_POSTINSTALL=true script: - ./bin/run-wp-unit-tests.sh if: branch = master and type != "pull_request" - stage: test php: 7.1 - env: WP_VERSION=latest SWITCH_TO_PHP=5.2 + env: + WP_VERSION=latest + SWITCH_TO_PHP=5.2 + SKIP_POSTINSTALL=true script: - ./bin/run-wp-unit-tests.sh - stage: test - env: WP_VERSION=latest + env: + WP_VERSION=latest + SKIP_POSTINSTALL=true + cache: + yarn: true script: - - npm install || exit 1 - ./bin/run-e2e-tests.sh || exit 1 + - stage: test language: node_js node_js: 8 @@ -82,6 +97,7 @@ jobs: - cd ./gutenberg-mobile - yarn install - ./.travis/travis-checks-js.sh + - stage: test language: node_js node_js: 8 @@ -96,6 +112,7 @@ jobs: - cd ./gutenberg-mobile - yarn install - ./.travis/travis-checks-js.sh + - stage: test language: node_js node_js: 8 diff --git a/bin/install-docker.sh b/bin/install-docker.sh index 56bb4ad3ef1c6..1ea162e33da62 100755 --- a/bin/install-docker.sh +++ b/bin/install-docker.sh @@ -26,7 +26,7 @@ docker-compose $DOCKER_COMPOSE_FILE_OPTIONS down --remove-orphans >/dev/null 2>& # Download image updates. echo -e $(status_message "Downloading Docker image updates...") -docker-compose $DOCKER_COMPOSE_FILE_OPTIONS pull +docker-compose $DOCKER_COMPOSE_FILE_OPTIONS pull --parallel # Launch the containers. echo -e $(status_message "Starting Docker containers...") diff --git a/bin/postinstall.sh b/bin/postinstall.sh new file mode 100755 index 0000000000000..5f512d43ce9e2 --- /dev/null +++ b/bin/postinstall.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +if [ "$SKIP_POSTINSTALL" != "true" ]; then + npm run mobile-install && npm run check-licenses && npm run build:packages +fi diff --git a/package.json b/package.json index af420ecd4b92a..a2a8a9da506ae 100644 --- a/package.json +++ b/package.json @@ -179,7 +179,7 @@ "mobile-submodule-update": "git submodule update --init --recursive", "mobile-install": "yarn --cwd gutenberg-mobile install", "preinstall": "npm run mobile-submodule-update", - "postinstall": " npm run mobile-install && npm run check-licenses && npm run build:packages", + "postinstall": "./bin/postinstall.sh", "pot-to-php": "./bin/pot-to-php.js", "precommit": "lint-staged", "publish:check": "npm run build:packages && lerna updated",