Skip to content

Commit

Permalink
Merge pull request #1655 from timber/1641/prefer_lowest
Browse files Browse the repository at this point in the history
Run "Prefer Lowest" tests
  • Loading branch information
jarednova committed Feb 11, 2018
2 parents ee1d3a4 + 206f023 commit dcc32aa
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 15 deletions.
18 changes: 8 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,20 @@ php:
- 7.1

env:
- WP_VERSION=4.7.3 WP_MULTISITE=0
- WP_VERSION=4.7.3 WP_MULTISITE=1
- WP_VERSION=latest WP_MULTISITE=0
- WP_VERSION=latest WP_MULTISITE=1

#matrix:
#include:
# php: 5.6.30
# env: WP_VERSION=4.6 WP_MULTISITE=0
- WP_VERSION=4.7.9 WP_MULTISITE=0 PREFER_LOWEST="--prefer-lowest --prefer-stable"
- WP_VERSION=4.7.9 WP_MULTISITE=0 PREFER_LOWEST=""
- WP_VERSION=4.7.9 WP_MULTISITE=1 PREFER_LOWEST=""
- WP_VERSION=latest WP_MULTISITE=0 PREFER_LOWEST=""
- WP_VERSION=latest WP_MULTISITE=1 PREFER_LOWEST=""
- WP_VERSION=latest WP_MULTISITE=1 PREFER_LOWEST="--prefer-lowest --prefer-stable"

before_script:
- if [ "$TRAVIS_PHP_VERSION" == 5.5 ] || [ "$TRAVIS_PHP_VERSION" == 5.4 ] || [ "$TRAVIS_PHP_VERSION" == 7.1 ]; then autodetect | pecl install imagick; fi
- if [ "$TRAVIS_PHP_VERSION" == 5.3 ]; then autodetect | pecl install imagick-3.0.1; fi
- bash bin/install-wp-tests.sh wordpress_test root '' localhost $WP_VERSION
# composer install --dev --prefer-source
- composer update $PREFER_LOWEST --dev --prefer-source
- composer require satooshi/php-coveralls:1.0.*
- composer install --dev --prefer-source

script:
- if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PHP_VERSION" == 7.1 ]; then mkdir -p build/logs; vendor/phpunit/phpunit/phpunit --coverage-clover build/logs/clover.xml -c phpunit.xml; else vendor/phpunit/phpunit/phpunit -c phpunit-nocover.xml; fi
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@
},
"require": {
"php": ">=5.3.0|7.*",
"twig/twig": "^1.0|2.*",
"twig/twig": "1.34.*|2.*",
"upstatement/routes": "0.4",
"composer/installers": "~1.0",
"asm89/twig-cache-extension": "~1.0"
},
"require-dev": {
"phpunit/phpunit": "5.7.16",
"wpackagist-plugin/advanced-custom-fields": "4.*",
"wpackagist-plugin/co-authors-plus" : "3.*"
"wpackagist-plugin/advanced-custom-fields": "4.4.*",
"wpackagist-plugin/co-authors-plus" : "3.2.*"
},
"suggest" : {
"satooshi/php-coveralls": "1.0.* for code coverage"
Expand Down
4 changes: 2 additions & 2 deletions readme.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
=== Timber ===
Contributors: jarednova, connorjburton, lggorman
Tags: template engine, templates, twig
Requires at least: 3.7
Requires at least: 4.7.9
Tested up to: 4.9.1
Stable tag: 1.7.0
Tested up to: 4.9.4
PHP version: 5.3.0 or greater
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Expand Down

0 comments on commit dcc32aa

Please sign in to comment.