diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-10-19 14:06:47 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-10-19 14:06:47 +0200 |
| commit | c5ae114315ac57c35fc888d4ac0119a8fddecd2f (patch) | |
| tree | fc6e58380b694be3affe8cbb60066ee1239afcea | |
| parent | 1001584c1b32145d9adf5d8d30f31fa15c650485 (diff) | |
| parent | bea1df7759a06428690dad00f1fa035c98b72f14 (diff) | |
| download | forums-c5ae114315ac57c35fc888d4ac0119a8fddecd2f.tar forums-c5ae114315ac57c35fc888d4ac0119a8fddecd2f.tar.gz forums-c5ae114315ac57c35fc888d4ac0119a8fddecd2f.tar.bz2 forums-c5ae114315ac57c35fc888d4ac0119a8fddecd2f.tar.xz forums-c5ae114315ac57c35fc888d4ac0119a8fddecd2f.zip | |
Merge pull request #5713 from marc1706/ticket/16185
[ticket/16185] Use xenial for builds on travis
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rwxr-xr-x | travis/check-executable-files.sh | 4 | ||||
| -rwxr-xr-x | travis/setup-mariadb.sh | 5 |
3 files changed, 8 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index be68ce8010..346d067240 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: php -dist: trusty +dist: xenial matrix: include: @@ -29,6 +29,8 @@ matrix: services: - redis-server + - postgresql + - mysql install: - travis/setup-phpbb.sh $DB $TRAVIS_PHP_VERSION $NOTESTS diff --git a/travis/check-executable-files.sh b/travis/check-executable-files.sh index 1aa8dca073..6899373c1e 100755 --- a/travis/check-executable-files.sh +++ b/travis/check-executable-files.sh @@ -48,13 +48,13 @@ then '(' \ ${executable_files} \ ')' -a \ - -not -perm +100 \ + -not -perm /100 \ ')' -o \ '(' \ -not '(' \ ${executable_files} \ ')' -a \ - -perm +111 \ + -perm /111 \ ')' \ ')' \ ')' \ diff --git a/travis/setup-mariadb.sh b/travis/setup-mariadb.sh index 95445dcc55..2efe99cc2d 100755 --- a/travis/setup-mariadb.sh +++ b/travis/setup-mariadb.sh @@ -12,13 +12,14 @@ set -e set -x # MariaDB Series -VERSION='10.0' +VERSION='10.1' # Operating system codename, e.g. "precise" OS_CODENAME=$(lsb_release --codename --short) # Manually purge MySQL to remove conflicting files (e.g. /etc/mysql/my.cnf) sudo apt-get purge -y mysql-common +sudo rm -rf /etc/mysql && sudo rm -rf /var/log/mysql && sudo rm -rf /var/lib/mysql && sudo rm -rf /var/lib/mysql-files && sudo rm -rf /var/lib/mysql-keyring if ! which add-apt-repository > /dev/null then @@ -27,7 +28,7 @@ then fi MIRROR_DOMAIN='ftp.osuosl.org' -sudo apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xcbcb082a1bb943db +sudo apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xF1656F24C74CD1D8 sudo add-apt-repository "deb http://$MIRROR_DOMAIN/pub/mariadb/repo/$VERSION/ubuntu $OS_CODENAME main" sudo apt-get update |