From e3a86a7108a8e6833a0b479a8e785ab42770baff Mon Sep 17 00:00:00 2001 From: Aaron Stone Date: Mon, 8 Aug 2016 11:37:31 -0700 Subject: [PATCH 1/4] Adjust the Travis CI matrix: Trusty, PHP 7.0, 7.1, fewer revisions of libmemcached --- .travis.yml | 29 ++++++++++++++--------------- .travis/travis.sh | 1 - 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index b2e113ef..4aae7552 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,26 +1,27 @@ +sudo: required +dist: trusty + language: php php: - 7.0 + - 7.1 + +matrix: + fast_finish: true + allow_failures: + - php: 7.1 env: - - LIBMEMCACHED_VERSION=1.0.18 - - LIBMEMCACHED_VERSION=1.0.17 - - LIBMEMCACHED_VERSION=1.0.16 - - LIBMEMCACHED_VERSION=1.0.15 - - LIBMEMCACHED_VERSION=1.0.14 - - LIBMEMCACHED_VERSION=1.0.10 - - LIBMEMCACHED_VERSION=1.0.8 - - LIBMEMCACHED_VERSION=1.0.7 - - LIBMEMCACHED_VERSION=1.0.6 - - LIBMEMCACHED_VERSION=1.0.2 - #- LIBMEMCACHED_VERSION=0.53 - #- LIBMEMCACHED_VERSION=0.49 - #- LIBMEMCACHED_VERSION=0.44 + - LIBMEMCACHED_VERSION=1.0.18 # Debian Jessie / Ubuntu Xenial + - LIBMEMCACHED_VERSION=1.0.16 # RHEL / CentOS 7 + - LIBMEMCACHED_VERSION=1.0.8 # Debian Wheezy / Ubuntu Trusty + addons: apt: packages: - sasl2-bin - libsasl2-dev + - libevent-dev before_script: - ./.travis/travis.sh before_script $LIBMEMCACHED_VERSION @@ -28,8 +29,6 @@ before_script: script: - ./.travis/travis.sh script $LIBMEMCACHED_VERSION -sudo: false - cache: directories: - $HOME/cache diff --git a/.travis/travis.sh b/.travis/travis.sh index 264a7f3b..17a04eea 100755 --- a/.travis/travis.sh +++ b/.travis/travis.sh @@ -79,7 +79,6 @@ function install_igbinary() { function install_msgpack() { git clone https://github.com/msgpack/msgpack-php.git pushd msgpack-php - git checkout master phpize ./configure make From 1c06e21945308625ce4669976b379a96dc318415 Mon Sep 17 00:00:00 2001 From: Aaron Stone Date: Mon, 8 Aug 2016 12:01:52 -0700 Subject: [PATCH 2/4] Use my msgpack fork temporarily for PHP 7.1 compatibility --- .travis/travis.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis/travis.sh b/.travis/travis.sh index 17a04eea..d64d1ff2 100755 --- a/.travis/travis.sh +++ b/.travis/travis.sh @@ -77,8 +77,9 @@ function install_igbinary() { } function install_msgpack() { - git clone https://github.com/msgpack/msgpack-php.git + git clone https://github.com/sodabrew/msgpack-php.git pushd msgpack-php + git checkout struct_unserialize_data phpize ./configure make @@ -237,7 +238,7 @@ case $ACTION in # Install igbinary extension install_igbinary - # install msgpack + # Install msgpack extension install_msgpack install_memcached From 4c6c3276e714f2a19c04c781d13303e9b417edca Mon Sep 17 00:00:00 2001 From: Aaron Stone Date: Tue, 6 Dec 2016 20:36:55 -0800 Subject: [PATCH 3/4] Return to msgpack msgpack-php --- .travis/travis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/travis.sh b/.travis/travis.sh index d64d1ff2..af680547 100755 --- a/.travis/travis.sh +++ b/.travis/travis.sh @@ -77,7 +77,7 @@ function install_igbinary() { } function install_msgpack() { - git clone https://github.com/sodabrew/msgpack-php.git + git clone https://github.com/msgpack/msgpack-php.git pushd msgpack-php git checkout struct_unserialize_data phpize From 1ec35bcd68ade5a7b0a6cccd674f301f508c73df Mon Sep 17 00:00:00 2001 From: Aaron Stone Date: Tue, 6 Dec 2016 20:37:22 -0800 Subject: [PATCH 4/4] Use master branch of msgpack --- .travis/travis.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis/travis.sh b/.travis/travis.sh index af680547..81049355 100755 --- a/.travis/travis.sh +++ b/.travis/travis.sh @@ -79,7 +79,6 @@ function install_igbinary() { function install_msgpack() { git clone https://github.com/msgpack/msgpack-php.git pushd msgpack-php - git checkout struct_unserialize_data phpize ./configure make