Skip to content

Commit

Permalink
Merge branch 'develop' into feature/857
Browse files Browse the repository at this point in the history
  • Loading branch information
Josh Pollock authored Oct 17, 2018
2 parents 8bc7c47 + a72e86a commit b474551
Show file tree
Hide file tree
Showing 1,891 changed files with 204,499 additions and 60,319 deletions.
61 changes: 45 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,60 @@
sudo: required
sudo: false

language: php

php: 7.1
php:
- '7.2'
- '7.1'
- '7.0'
- '5.6'

notifications:
email:
on_success: never
on_failure: change


cache:
directories:
- $HOME/.composer/cache
cache: false

env:
- PHP_IMAGE_TAG=7.2-alpine WORDPRESS_VERSION=latest
- PHP_IMAGE_TAG=7.2-alpine WORDPRESS_VERSION=trunk
- PHP_IMAGE_TAG=7.1-alpine WORDPRESS_VERSION=4.8
- PHP_IMAGE_TAG=7.1-alpine WORDPRESS_VERSION=4.7
- PHP_IMAGE_TAG=7.1-alpine WORDPRESS_VERSION=latest
- PHP_IMAGE_TAG=7.0-alpine WORDPRESS_VERSION=latest
- PHP_IMAGE_TAG=5.6-alpine WORDPRESS_VERSION=latest
- WP_VERSION=latest

matrix:
include:
- php: 7.2
env: WP_VERSION=trunk
- php: 7.2
env: WP_VERSION=latest WP_MULTISITE=1
- php: 7.2
env: WP_VERSION=4.8
- php: 7.2
env: WP_VERSION=4.7.11

before_script:
- export PATH="$HOME/.composer/vendor/bin:$PATH"
- composer update
- composer wp-install

script: composer wp-tests
- composer update --prefer-dist
- |
if [ -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini ]; then
phpenv config-rm xdebug.ini
else
echo "xdebug.ini does not exist"
fi
- |
if [[ ! -z "$WP_VERSION" ]] ; then
bash bin/install-wp-tests.sh wordpress_test root '' localhost $WP_VERSION
composer global require "phpunit/phpunit=4.8.*|5.7.*"
fi
- |
if [[ "$WP_TRAVISCI" == "phpcs" ]] ; then
composer global require wp-coding-standards/wpcs
phpcs --config-set installed_paths $HOME/.composer/vendor/wp-coding-standards/wpcs
fi
script:
- |
if [[ ! -z "$WP_VERSION" ]] ; then
phpunit
fi
- |
if [[ "$WP_TRAVISCI" == "phpcs" ]] ; then
phpcs
fi
3 changes: 2 additions & 1 deletion assets/build/css/caldera-forms-front.min.css

Large diffs are not rendered by default.

11 changes: 6 additions & 5 deletions assets/build/js/caldera-forms-front.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/build/js/edit.min.js

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion assets/build/js/field-config.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit b474551

Please sign in to comment.