Skip to content

Commit

Permalink
Update travis for latest composer_manager.
Browse files Browse the repository at this point in the history
  • Loading branch information
bojanz committed Aug 20, 2015
1 parent d53775a commit bec25f7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 11 deletions.
12 changes: 3 additions & 9 deletions .travis-before-script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,13 @@ cd "$DRUPAL_TI_DRUPAL_DIR"
git clone --branch 8.x-1.x http://git.drupal.org/project/inline_entity_form.git
)

# Initialize composer_manager.
php modules/composer_manager/scripts/init.php

# Ensure the module is linked into the codebase.
drupal_ti_ensure_module_linked

# Rebuild core dependencies.
# @todo Is that really needed?
cd core
rm -rf vendor
# Initialize composer_manager.
php modules/composer_manager/scripts/init.php
composer drupal-rebuild
composer update --prefer-source -n --verbose
cd ..
composer install --prefer-source -n --verbose

# Enable main module and submodules.
drush en -y commerce commerce_product commerce_order
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ env:
- DRUPAL_TI_BEHAT_BROWSER="firefox"

# PHPUnit specific commandline arguments.
- DRUPAL_TI_PHPUNIT_ARGS=""
- DRUPAL_TI_PHPUNIT_ARGS="-c core"
# Specifying the phpunit-core src/ directory is useful when e.g. a vendor/
# directory is present in the module directory, which phpunit would then
# try to find tests in. This option is relative to $TRAVIS_BUILD_DIR.
Expand All @@ -90,7 +90,7 @@ env:
matrix:
# [[[ SELECT ANY OR MORE OPTIONS ]]]
#- DRUPAL_TI_RUNNERS="phpunit"
- DRUPAL_TI_RUNNERS="phpunit-core simpletest"
- DRUPAL_TI_RUNNERS="phpunit simpletest"
#- DRUPAL_TI_RUNNERS="behat"
#- DRUPAL_TI_RUNNERS="phpunit simpletest behat"

Expand Down

0 comments on commit bec25f7

Please sign in to comment.