Skip to content

Commit

Permalink
chore(ci): include 7.4 and nightly
Browse files Browse the repository at this point in the history
* chore(ci): Added 7.4 (just released) and nightly (as an allowed failure).
* chore(composer): Swap out abandoned coveralls package for maintained version.
* chore(composer): Added PHPUnit as a dev dependency.
* chore(ci): Dropped a ton of the juggling in favor of version juggling in Composer.
* fix(readme): Corrected the badge for the license.
* chore(composer): Bumped the package's version number.
  • Loading branch information
joshtronic committed Dec 6, 2019
1 parent e97edee commit 0f45ca7
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 17 deletions.
20 changes: 7 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,33 +14,27 @@ matrix:
dist: trusty
- php: 7.0
dist: xenial
env: PHPUNIT=5.7
- php: 7.1
env: PHPUNIT=7.5
- php: 7.2
- php: 7.3
- php: 7.4
env: COVERAGE=true
- php: nightly
allow_failures:
- php: nightly

install:
- php --version
- composer install
- |
if [[ $PHPUNIT ]]; then
composer require "phpunit/phpunit:$PHPUNIT"
fi

before_script:
- mkdir -p build/logs

script:
- |
if [[ $PHPUNIT ]]; then
vendor/bin/phpunit --coverage-clover build/logs/clover.xml
else
phpunit --coverage-clover build/logs/clover.xml
fi
- vendor/bin/phpunit --coverage-clover build/logs/clover.xml

after_success:
- |
if [[ $COVERAGE ]]; then
php vendor/bin/coveralls --config .coveralls.yml -v
travis_retry php vendor/bin/php-coveralls --config .coveralls.yml -v
fi
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Holiday API PHP Library

[![License](https://img.shields.io/npm/l/holidayapi-php?style=for-the-badge)](https://github.com/holidayapi/holidayapi-php/blob/master/LICENSE)
[![License](https://img.shields.io/packagist/l/holidayapi/holidayapi-php?style=for-the-badge)](https://github.com/holidayapi/holidayapi-php/blob/master/LICENSE)
![PHP Version](https://img.shields.io/packagist/php-v/holidayapi/holidayapi-php?style=for-the-badge)
![Build Status](https://img.shields.io/travis/holidayapi/holidayapi-php/master?style=for-the-badge)
[![Coverage Status](https://img.shields.io/coveralls/github/holidayapi/holidayapi-php/master?style=for-the-badge)](https://coveralls.io/github/holidayapi/holidayapi-php?branch=master)
Expand Down
7 changes: 4 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "holidayapi/holidayapi-php",
"description": "Official PHP library for Holiday API",
"version": "2.0.0",
"version": "2.1.0",
"type": "library",
"keywords": [
"calendar",
Expand All @@ -17,10 +17,11 @@
"homepage": "https://holidayapi.com"
}],
"require": {
"php": ">=5.3.0"
"php": ">=5.3"
},
"require-dev": {
"satooshi/php-coveralls": "~1.0"
"php-coveralls/php-coveralls": ">=1",
"phpunit/phpunit": ">=4"
},
"autoload": {
"psr-4": { "HolidayAPI\\": "src/" }
Expand Down

0 comments on commit 0f45ca7

Please sign in to comment.