Skip to content

Commit 5318a50

Browse files
committed
Merge pull request #286 from symfony-cmf/travis_config
Use latest versions in the test matrix
2 parents 73b1633 + 87b834b commit 5318a50

File tree

2 files changed

+24
-19
lines changed

2 files changed

+24
-19
lines changed

.travis.yml

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,41 @@
11
language: php
22

3+
php:
4+
- 5.3
5+
- 5.4
6+
- 5.5
7+
- 5.6
8+
- hhvm
9+
310
sudo: false
411

512
cache:
6-
directories:
7-
- $HOME/.composer/cache
8-
9-
php:
10-
- 5.3
11-
- 5.4
12-
- 5.5
13-
- 5.6
14-
- hhvm
13+
directories:
14+
- $HOME/.composer/cache
1515

1616
env:
17-
- SYMFONY_VERSION=no
17+
- SYMFONY_VERSION=2.6.*
1818

1919
matrix:
2020
include:
21-
- php: 5.5
21+
- php: 5.6
2222
env: SYMFONY_VERSION=2.3.*
23-
- php: 5.5
24-
env: SYMFONY_VERSION=2.4.*
25-
- php: 5.5
26-
env: SYMFONY_VERSION=2.6.*
23+
- php: 5.6
24+
env: SYMFONY_VERSION=2.5.*
25+
- php: 5.6
26+
env: SYMFONY_VERSION=2.7.*
27+
- php: 5.6
28+
env: SYMFONY_VERSION=3.0.*
29+
allow_failures:
30+
- php: 5.6
31+
env: SYMFONY_VERSION=2.7.*
32+
- php: 5.6
33+
env: SYMFONY_VERSION=3.0.*
2734

2835
before_script:
2936
- composer self-update
30-
- sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;'
31-
- sh -c 'if [ "$SYMFONY_VERSION" != "no" ]; then composer require symfony/symfony:${SYMFONY_VERSION} --no-update; fi;'
32-
- composer update --prefer-dist
37+
- if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
38+
- composer require symfony/symfony:${SYMFONY_VERSION} --prefer-dist
3339
- vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh
3440

3541
script: phpunit --coverage-text

composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
"symfony/framework-bundle": "~2.3"
2020
},
2121
"require-dev": {
22-
"symfony/symfony": "2.6.*",
2322
"symfony-cmf/core-bundle": "~1.1",
2423
"symfony-cmf/testing": "~1.1",
2524
"matthiasnoback/symfony-dependency-injection-test": "0.*",

0 commit comments

Comments
 (0)