Skip to content

Commit

Permalink
Build Tools: Install Composer dependencies as prelint step (#21537)
Browse files Browse the repository at this point in the history
  • Loading branch information
aduth authored Apr 17, 2020
1 parent cc0fdda commit 078c83b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
8 changes: 1 addition & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ env:
- PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: true
- WP_DEVELOP_DIR: ./wordpress
- LOCAL_SCRIPT_DEBUG: false
- INSTALL_COMPOSER: false
- INSTALL_WORDPRESS: true

# Make sure NodeGit gets the correct C libs.
Expand Down Expand Up @@ -89,10 +88,6 @@ install:
npm run env connect
npm run env cli plugin activate gutenberg
fi
- |
if [[ "$INSTALL_COMPOSER" = "true" ]]; then
npm run env docker-run -- php composer install --no-interaction
fi
- |
if [[ "$E2E_ROLE" = "author" ]]; then
npm run env cli -- user create author author@example.com --role=author --user_pass=authpass
Expand Down Expand Up @@ -159,12 +154,11 @@ jobs:
- npm run test-unit:native -- --ci --maxWorkers=2 --cacheDirectory="$HOME/.jest-cache"

- name: PHP unit tests
env: INSTALL_COMPOSER=true
script:
- npm run test-php && npm run test-unit-php-multisite

- name: PHP unit tests (PHP 5.6)
env: INSTALL_COMPOSER=true LOCAL_PHP=5.6-fpm
env: LOCAL_PHP=5.6-fpm
script:
- npm run test-php && npm run test-unit-php-multisite

Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@
"lint": "concurrently \"npm run lint-js\" \"npm run lint-pkg-json\" \"npm run lint-css\"",
"lint-js": "wp-scripts lint-js",
"lint-js:fix": "npm run lint-js -- --fix",
"prelint-php": "npm run wp-env run composer install -- --no-interaction",
"lint-php": "npm run wp-env run composer run-script lint",
"lint-pkg-json": "wp-scripts lint-pkg-json . 'packages/*/package.json'",
"lint-css": "wp-scripts lint-style '**/*.scss'",
Expand Down

0 comments on commit 078c83b

Please sign in to comment.