Skip to content

Commit 52fb25e

Browse files
committed
Improve Travis setup
1 parent d1ac496 commit 52fb25e

File tree

2 files changed

+15
-16
lines changed

2 files changed

+15
-16
lines changed

.travis.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,34 +12,34 @@ sudo: false
1212

1313
cache:
1414
directories:
15-
- $HOME/.composer/cache
15+
- $HOME/.composer/cache/files
1616

17-
env:
18-
- SYMFONY_VERSION=2.7.*
17+
env: SYMFONY_VERSION=2.8.*
1918

2019
matrix:
2120
include:
21+
- php: 5.6
22+
env: DEPS=dev
2223
- php: 5.3
23-
env: SYMFONY_VERSION=2.3.* COMPOSER_FLAGS="--prefer-lowest"
24+
env: COMPOSER_FLAGS="--prefer-lowest"
2425
- php: 5.6
2526
env: SYMFONY_VERSION=2.3.*
2627
- php: 5.6
27-
env: SYMFONY_VERSION=2.8.*
28+
env: SYMFONY_VERSION=2.7.*
2829
- php: 5.6
2930
env: SYMFONY_VERSION=3.0.*
30-
allow_failures:
31-
- env: SYMFONY_VERSION=2.8.*
32-
- env: SYMFONY_VERSION=3.0.*
3331
finish_fast: true
3432

35-
# we install our own composer to set memory limit to illimited, because on php 5.3 the memory consumption is gigantic
3633
before_install:
37-
- curl -sS http://getcomposer.org/composer.phar > composer.phar
38-
- php composer.phar require symfony/routing:${SYMFONY_VERSION} --no-update
34+
- if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
35+
- phpenv config-rm xdebug.ini || true
36+
- composer self-update
37+
- if [ "$DEPS" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi
38+
- if [ "$SYMFONY_VERSION" != "" ]; then composer require symfony/symfony:${SYMFONY_VERSION} --no-update; fi
3939

40-
install: travis_wait php -d memory_limit=-1 composer.phar update --prefer-dist $COMPOSER_FLAGS
40+
install: composer update --prefer-dist $COMPOSER_FLAGS
4141

42-
script: phpunit --coverage-text
42+
script: phpunit
4343

4444
notifications:
4545
irc: "irc.freenode.org#symfony-cmf"

composer.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,20 @@
1111
"homepage": "https://github.com/symfony-cmf/Routing/contributors"
1212
}
1313
],
14-
"minimum-stability": "dev",
1514
"require": {
1615
"php": "^5.3.9|^7.0",
1716
"symfony/routing": "^2.2|3.*",
1817
"symfony/http-kernel": "^2.2|3.*",
1918
"psr/log": "1.*"
2019
},
2120
"require-dev": {
22-
"symfony-cmf/testing": "^1.3",
21+
"symfony-cmf/testing": "^1.3@dev",
2322
"symfony/dependency-injection": "^2.0.5|3.*",
2423
"symfony/config": "^2.2|3.*",
2524
"symfony/event-dispatcher": "^2.1|3.*"
2625
},
2726
"suggest": {
28-
"symfony/event-dispatcher": "DynamicRouter can optionally trigger an event at the start of matching. Minimal version ~2.1"
27+
"symfony/event-dispatcher": "DynamicRouter can optionally trigger an event at the start of matching. Minimal version (~2.1)"
2928
},
3029
"autoload": {
3130
"psr-4": {

0 commit comments

Comments
 (0)