Skip to content

Commit

Permalink
revert mariadb setup script
Browse files Browse the repository at this point in the history
  • Loading branch information
saracarl committed Jul 24, 2019
1 parent 8ffbf00 commit 0da95f3
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 0 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ before_install:
- sudo apt-get install g++ qt5-default libqt5webkit5-dev gstreamer1.0-plugins-base gstreamer1.0-tools gstreamer1.0-x
- export QMAKE=/usr/lib/x86_64-linux-gnu/qt5/bin/qmake
- qtchooser -qt=qt5
- bash travis/.travis_setup.sh
- mysql -e 'CREATE DATABASE test;'

before_script:
Expand Down
5 changes: 5 additions & 0 deletions travis/.travis_mariadb.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/usr/bin/env bash

set -eux

sudo apt-get install libmariadbclient-dev
11 changes: 11 additions & 0 deletions travis/.travis_setup.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
set -eux

# Install MySQL 5.7 if DB=mysql57
if [[ -n ${DB-} && x$DB =~ ^xmysql57 ]]; then
sudo bash travis/.travis_mysql57.sh
fi

#Update mysql connector for maria db
if [[ -n ${DB-} && x$DB =~ ^xmariadb ]]; then
sudo bash travis/.travis_mariadb.sh
fi

0 comments on commit 0da95f3

Please sign in to comment.