Permalink
Browse files

Merge branch '7.3'

  • Loading branch information...
mnocon committed Oct 31, 2018
2 parents aafd7b8 + 13eda2b commit 3b57fb06798880ff4d875ca4d533d7a491b9c41d
Showing with 6 additions and 1 deletion.
  1. +5 −0 .travis.yml
  2. +1 −1 bin/.travis/prepare_unittest.sh
@@ -50,6 +50,11 @@ matrix:
env: TEST_CONFIG="phpunit.xml"
- php: 7.2
env: ELASTICSEARCH_VERSION="1.4.2" TEST_CONFIG="phpunit-integration-legacy-elasticsearch.xml"
- 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"
addons:
mariadb: 10.3
# test only master, stable branches and pull requests
@@ -22,7 +22,7 @@ if [ "$CUSTOM_CACHE_POOL" = "singleredis" ] ; then
fi
# Setup DB
if [ "$DB" = "mysql" ] ; then
if [ "$DB" = "mysql" ] || [ "$DB" = "mariadb" ] ; then
# https://github.com/travis-ci/travis-ci/issues/3049
# make sure we don't run out of entropy apparently (see link above)
sudo apt-get -y install haveged

0 comments on commit 3b57fb0

Please sign in to comment.