tonyair/silverstripe-versionfeed
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-versionfeed synced 2024-10-22 11:05:31 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #18 from mateusz/travis

Browse Source 
Fix version dependencies, and fix what travis builds.
This commit is contained in:
Damian Mooyman 2015-03-30 14:42:38 +13:00
commit 8de4e31fca
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -14,9 +14,9 @@ matrix:
- php: 5.3 - php: 5.3
env: DB=PGSQL CORE_RELEASE=3.1 env: DB=PGSQL CORE_RELEASE=3.1
- php: 5.4 - php: 5.4
env: DB=MYSQL CORE_RELEASE=master env: DB=MYSQL CORE_RELEASE=3.1
- php: 5.5 - php: 5.5
env: DB=MYSQL CORE_RELEASE=master env: DB=MYSQL CORE_RELEASE=3.1
before_script: before_script:
- phpenv rehash - phpenv rehash
@ -25,4 +25,4 @@ before_script:
- cd ~/builds/ss - cd ~/builds/ss
script: script:
- phpunit versionfeed/tests/ - phpunit versionfeed/tests/

6
composer.json
View File

@ -12,7 +12,7 @@
], ],
"require": "require":
{ {
"silverstripe/framework": "3.*", "silverstripe/framework": ">=3.1",
"silverstripe/cms": "3.*" "silverstripe/cms": ">=3.1"
} }
} }

1
tests/VersionFeedFunctionalTest.php
View File

@ -213,3 +213,4 @@ class VersionFeedFunctionalTest extends FunctionalTest {
} }
} }