Skip to content

Commit

Permalink
DevKit updates (#171)
Browse files Browse the repository at this point in the history
  • Loading branch information
SonataCI committed Aug 7, 2017
2 parents 2b6f8da + 65c05ca commit 5f8d698
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .styleci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,5 @@ finder:
- 'Tests/Fixtures'
# ecommerce special case:
- 'Resources/skeleton'
# ignore vendor assets
- 'Resources/public/vendor'
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ php:
- '7.0'
- '7.1'
- nightly
- hhvm

sudo: false

Expand Down Expand Up @@ -64,6 +63,8 @@ matrix:
env: SONATA_ADMIN=dev-master@dev
- php: '7.1'
env: SYMFONY_DEPRECATIONS_HELPER=0
- php: hhvm
dist: trusty
allow_failures:
- php: nightly
- php: hhvm
Expand Down
4 changes: 0 additions & 4 deletions .travis/before_script_test.sh
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
#!/usr/bin/env sh
set -ev

if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then
mv /tmp/xdebug.ini "$HOME/.phpenv/versions/$(phpenv version-name)/etc/conf.d"
fi
2 changes: 1 addition & 1 deletion .travis/install_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ chmod u+x "${HOME}/bin/coveralls"
# https://github.com/composer/composer/issues/5030
composer update --prefer-dist --no-interaction --prefer-stable --quiet --ignore-platform-reqs

travis_wait composer update --prefer-dist --no-interaction --prefer-stable ${COMPOSER_FLAGS}
composer update --prefer-dist --no-interaction --prefer-stable ${COMPOSER_FLAGS}

0 comments on commit 5f8d698

Please sign in to comment.