Skip to content

Commit f21ed13

Browse files
committed
Merge pull request #278 from symfony-cmf/travis_patch
Use new container-based env and caching
2 parents 330c3ac + 329bec2 commit f21ed13

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

.travis.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
language: php
22

3+
sudo: false
4+
5+
cache:
6+
directories:
7+
- vendor
8+
39
php:
410
- 5.3
511
- 5.4
@@ -8,7 +14,7 @@ php:
814
- hhvm
915

1016
env:
11-
- SYMFONY_VERSION=2.5.*
17+
- SYMFONY_VERSION=no
1218

1319
matrix:
1420
include:
@@ -22,7 +28,8 @@ matrix:
2228
before_script:
2329
- composer self-update
2430
- sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;'
25-
- composer require symfony/symfony:${SYMFONY_VERSION} --prefer-source
31+
- sh -c 'if [ "$SYMFONY_VERSION" != "no" ]; then composer require symfony/symfony:${SYMFONY_VERSION} --no-update; fi;'
32+
- composer update --prefer-source
2633
- vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh
2734

2835
script: phpunit --coverage-text

composer.json

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

0 commit comments

Comments
 (0)