Skip to content

Commit

Permalink
Merge branch '7.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
andrerom committed Dec 18, 2018
2 parents e4b8fd6 + 073888b commit 08b6057
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions .travis.yml
Expand Up @@ -25,6 +25,8 @@ env:
global:
# For functional and acceptance tests
- COMPOSE_FILE="doc/docker/base-dev.yml:doc/docker/selenium.yml"
# In order to specify extra flags like ignoring platform reqs, using only stable packages and so on.
- COMPOSER_FLAGS=""

matrix:
fast_finish: true
Expand All @@ -50,9 +52,13 @@ matrix:
env: TEST_CONFIG="phpunit.xml"
- php: 7.2
env: ELASTICSEARCH_VERSION="1.4.2" TEST_CONFIG="phpunit-integration-legacy-elasticsearch.xml"
# 7.3
# Temp: Need to use --ignore-platform-reqs due to: https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues/3697
- php: 7.3
env: TEST_CONFIG="phpunit.xml" COMPOSER_FLAGS="--ignore-platform-reqs"
- name: Legacy Storage engine tests with MariaDB 10.3
php: 7.1
env: TEST_CONFIG="phpunit-integration-legacy.xml" DB="mariadb" DATABASE="mysql://root@localhost/testdb"
php: 7.3
env: TEST_CONFIG="phpunit-integration-legacy.xml" DB="mariadb" DATABASE="mysql://root@localhost/testdb" COMPOSER_FLAGS="--ignore-platform-reqs"
addons:
mariadb: 10.3

Expand Down Expand Up @@ -80,7 +86,7 @@ before_install:
- TEST_TIMEZONE=${TEST_TIMEZONES["`shuf -i 0-2 -n 1`"]}

install:
- if [ "$TEST_CONFIG" != "" ] ; then travis_retry composer install --no-progress --no-interaction --prefer-dist ; fi
- if [ "$TEST_CONFIG" != "" ] ; then travis_retry composer install --no-progress --no-interaction --prefer-dist $COMPOSER_FLAGS; fi
# Setup Solr / Elastic search if asked for
- if [ "$TEST_CONFIG" = "phpunit-integration-legacy-elasticsearch.xml" ] ; then ./bin/.travis/init_elasticsearch.sh ; fi
- if [ "$TEST_CONFIG" = "phpunit-integration-legacy-solr.xml" ] ; then ./vendor/ezsystems/ezplatform-solr-search-engine/bin/.travis/init_solr.sh; fi
Expand Down

0 comments on commit 08b6057

Please sign in to comment.