ci: Update travis matrix and vendor test helpers

This commit is contained in:
Markus Frosch 2018-11-27 11:01:19 +01:00
parent 91a62ffbee
commit e6fde04bc3
2 changed files with 8 additions and 6 deletions

View File

@ -6,6 +6,7 @@ php:
- '7.0'
- '7.1'
- '7.2'
- '7.3'
- nightly
services:
@ -27,6 +28,7 @@ matrix:
php: '5.4'
allow_failures:
- php: nightly
- php: '7.3'
env:
- CHECK=phpunit DB=mysql DIRECTOR_TESTDB_RES="Director MySQL TestDB" DIRECTOR_TESTDB="director_test"

View File

@ -2,13 +2,13 @@
set -ex
MODULE_HOME=${MODULE_HOME:="$(dirname "$(readlink -f $(dirname "$0"))")"}
MODULE_HOME=${MODULE_HOME:="$(dirname "$(readlink -f "$(dirname "$0")")")"}
PHP_VERSION="$(php -r 'echo phpversion();')"
ICINGAWEB_VERSION=${ICINGAWEB_VERSION:=2.5.0}
ICINGAWEB_VERSION=${ICINGAWEB_VERSION:=2.6.2}
ICINGAWEB_GITREF=${ICINGAWEB_GITREF:=}
PHPCS_VERSION=${PHPCS_VERSION:=2.9.1}
PHPCS_VERSION=${PHPCS_VERSION:=3.3.2}
if [ "$PHP_VERSION" '<' 5.6.0 ]; then
PHPUNIT_VERSION=${PHPUNIT_VERSION:=4.8}
@ -16,7 +16,7 @@ else
PHPUNIT_VERSION=${PHPUNIT_VERSION:=5.7}
fi
cd ${MODULE_HOME}
cd "${MODULE_HOME}"
test -d vendor || mkdir vendor
cd vendor/
@ -48,8 +48,8 @@ else
rm -f icingaweb2
ln -svf "${icingaweb_path}" icingaweb2
fi
ln -svf "${icingaweb_path}"/library/Icinga
ln -svf "${icingaweb_path}"/library/vendor/Zend
ln -svf "${icingaweb_path}"/library/Icinga Icinga
ln -svf "${icingaweb_path}"/library/vendor/Zend Zend
# phpunit
phpunit_path="phpunit-${PHPUNIT_VERSION}"