Skip to content

Commit

Permalink
Merge pull request silverstripe#17 from creative-commoners/travis-php7
Browse files Browse the repository at this point in the history
Add PHP7 + SS3.6 build to Travis configuration and fix build badge
  • Loading branch information
dhensby authored Jun 15, 2017
2 parents 6000887 + 7774cff commit 1082476
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# See https://github.com/silverstripe-labs/silverstripe-travis-support for setup details
# See https://github.com/silverstripe/silverstripe-travis-support for setup details

language: php
php:
Expand All @@ -17,9 +17,11 @@ matrix:
env: DB=MYSQL CORE_RELEASE=3
- php: 5.4
env: DB=MYSQL CORE_RELEASE=3
- php: 7.1
env: DB=MYSQL CORE_RELEASE=3.6

before_script:
- git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
- git clone git://github.com/silverstripe/silverstripe-travis-support.git ~/travis-support
- php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss
- cd ~/builds/ss

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
}
],
"require": {
"silverstripe/comments": ">=1.2"
"silverstripe/comments": "^2.0"
},
"require-dev": {
"phpunit/PHPUnit": "~3.7@stable"
Expand Down
4 changes: 2 additions & 2 deletions readme.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Comment Notifications

[![Build Status](https://secure.travis-ci.org/silverstripe-labs/comment-notifications.png?branch=master)](http://travis-ci.org/silverstripe-labs/comment-notifications)
[![Build Status](https://secure.travis-ci.org/silverstripe/comment-notifications.png?branch=master)](http://travis-ci.org/silverstripe/comment-notifications)

Provides simple comment notifications

Expand All @@ -13,4 +13,4 @@ composer require silverstripe/comment-notifications 1.0.x-dev
## Configuration

Check out the [CommentNotifiable](code/CommentNotifiable.php) class for the list of options you can
override in your page class.
override in your page class.

0 comments on commit 1082476

Please sign in to comment.