mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-10 05:18:52 +00:00
[ticket/16538] Move script execution to setip-phpbb.sh
PHPBB3-16538
This commit is contained in:
parent
55d9154b01
commit
3bbe0f1d4e
3 changed files with 7 additions and 11 deletions
|
@ -35,11 +35,8 @@ services:
|
||||||
- mysql
|
- mysql
|
||||||
- memcached
|
- memcached
|
||||||
|
|
||||||
before_install:
|
|
||||||
- travis/setup-mysql8.sh $MYSQL8
|
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- travis/setup-phpbb.sh $DB $TRAVIS_PHP_VERSION $NOTESTS
|
- travis/setup-phpbb.sh $DB $TRAVIS_PHP_VERSION ${NOTESTS:-0} ${MYSQL8:-0}
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- travis/setup-database.sh $DB $TRAVIS_PHP_VERSION $NOTESTS
|
- travis/setup-database.sh $DB $TRAVIS_PHP_VERSION $NOTESTS
|
||||||
|
|
|
@ -11,13 +11,6 @@
|
||||||
set -e
|
set -e
|
||||||
set -x
|
set -x
|
||||||
|
|
||||||
MYSQL8=$1
|
|
||||||
|
|
||||||
if [ "$MYSQL8" != '1' ]
|
|
||||||
then
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
wget https://repo.mysql.com//mysql-apt-config_0.8.15-1_all.deb
|
wget https://repo.mysql.com//mysql-apt-config_0.8.15-1_all.deb
|
||||||
sudo dpkg -i mysql-apt-config_0.8.15-1_all.deb
|
sudo dpkg -i mysql-apt-config_0.8.15-1_all.deb
|
||||||
sudo apt-get update -q
|
sudo apt-get update -q
|
||||||
|
|
|
@ -14,6 +14,7 @@ set -x
|
||||||
DB=$1
|
DB=$1
|
||||||
TRAVIS_PHP_VERSION=$2
|
TRAVIS_PHP_VERSION=$2
|
||||||
NOTESTS=$3
|
NOTESTS=$3
|
||||||
|
MYSQL8=$4
|
||||||
|
|
||||||
if [ "$NOTESTS" == '1' ]
|
if [ "$NOTESTS" == '1' ]
|
||||||
then
|
then
|
||||||
|
@ -26,6 +27,11 @@ then
|
||||||
travis/setup-mariadb.sh
|
travis/setup-mariadb.sh
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ "$MYSQL8" == '1' ]
|
||||||
|
then
|
||||||
|
travis/setup-mysql8.sh
|
||||||
|
fi
|
||||||
|
|
||||||
if [ "$NOTESTS" != '1' ]
|
if [ "$NOTESTS" != '1' ]
|
||||||
then
|
then
|
||||||
travis/setup-php-extensions.sh
|
travis/setup-php-extensions.sh
|
||||||
|
|
Loading…
Add table
Reference in a new issue