diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-10-25 14:01:41 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-10-25 14:01:41 +0200 |
| commit | f40f378483f84aaf4e3a636e15589a40e16e0b90 (patch) | |
| tree | e204802ed07a336b9094e9467a9e0eeadf675cf6 /travis | |
| parent | fe7745a1e8f8b623e088d07b821fe83c745f4371 (diff) | |
| parent | 66841a55d05ec0d0c0928b86bbf66f93bff8bede (diff) | |
| download | forums-f40f378483f84aaf4e3a636e15589a40e16e0b90.tar forums-f40f378483f84aaf4e3a636e15589a40e16e0b90.tar.gz forums-f40f378483f84aaf4e3a636e15589a40e16e0b90.tar.bz2 forums-f40f378483f84aaf4e3a636e15589a40e16e0b90.tar.xz forums-f40f378483f84aaf4e3a636e15589a40e16e0b90.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11920] Pin MariaDB repository to avoid conflicts with Ubuntu MySQL.
Diffstat (limited to 'travis')
| -rwxr-xr-x | travis/setup-mariadb.sh | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/travis/setup-mariadb.sh b/travis/setup-mariadb.sh index 02520b1c2c..d9a88edb24 100755 --- a/travis/setup-mariadb.sh +++ b/travis/setup-mariadb.sh @@ -20,10 +20,20 @@ then sudo apt-get install -qq python-software-properties fi +MIRROR_DOMAIN='ftp.osuosl.org' sudo apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xcbcb082a1bb943db -sudo add-apt-repository "deb http://ftp.osuosl.org/pub/mariadb/repo/$VERSION/ubuntu $OS_CODENAME main" +sudo add-apt-repository "deb http://$MIRROR_DOMAIN/pub/mariadb/repo/$VERSION/ubuntu $OS_CODENAME main" sudo apt-get update -qq +# Pin repository in order to avoid conflicts with MySQL from distribution +# repository. See https://mariadb.com/kb/en/installing-mariadb-deb-files +# section "Version Mismatch Between MariaDB and Ubuntu/Debian Repositories" +echo " +Package: * +Pin: origin $MIRROR_DOMAIN +Pin-Priority: 1000 +" | sudo tee /etc/apt/preferences.d/mariadb + sudo debconf-set-selections <<< "mariadb-server-$VERSION mysql-server/root_password password rootpasswd" sudo debconf-set-selections <<< "mariadb-server-$VERSION mysql-server/root_password_again password rootpasswd" sudo apt-get install -qq mariadb-server |