Test php 7.0 and 7.1 on Travis

- php-7.1 set as failing for now due to one broken example (references)
- Look for php 7.1 in configure.ac.
This commit is contained in:
William S Fulton 2016-12-04 21:38:06 +00:00
commit 3546d096a7
3 changed files with 22 additions and 1 deletions

View file

@ -94,6 +94,16 @@ matrix:
env: SWIGLANG=php5 env: SWIGLANG=php5
sudo: required sudo: required
dist: trusty dist: trusty
- compiler: gcc
os: linux
env: SWIGLANG=php VER=7.0
sudo: required
dist: trusty
- compiler: gcc
os: linux
env: SWIGLANG=php VER=7.1
sudo: required
dist: trusty
- compiler: gcc - compiler: gcc
os: linux os: linux
env: SWIGLANG=python VER=2.4 env: SWIGLANG=python VER=2.4
@ -276,6 +286,12 @@ matrix:
env: SWIGLANG=python SWIG_FEATURES=-O env: SWIGLANG=python SWIG_FEATURES=-O
sudo: required sudo: required
dist: trusty dist: trusty
# php7.1 nearly working
- compiler: gcc
os: linux
env: SWIGLANG=php VER=7.1
sudo: required
dist: trusty
before_install: before_install:
- date -u - date -u
- uname -a - uname -a

View file

@ -74,6 +74,11 @@ case "$SWIGLANG" in
"php5") "php5")
sudo apt-get -qq install php5-cli php5-dev sudo apt-get -qq install php5-cli php5-dev
;; ;;
"php")
sudo add-apt-repository -y ppa:ondrej/php
sudo apt-get -qq update
sudo apt-get -qq install php$VER-cli php$VER-dev
;;
"python") "python")
sudo apt-get -qq install pep8 sudo apt-get -qq install pep8
if [[ "$PY3" ]]; then if [[ "$PY3" ]]; then

View file

@ -1960,7 +1960,7 @@ if test x"${PHPBIN}" = xno; then
PHP= PHP=
else else
if test "x$PHPBIN" = xyes; then if test "x$PHPBIN" = xyes; then
AC_CHECK_PROGS(PHP, [php7.0 php]) AC_CHECK_PROGS(PHP, [php7.1 php7.0 php])
else else
PHP=$PHPBIN PHP=$PHPBIN
fi fi