From 7d5cd98c17bafd39bac7f29052b7308904861642 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Tue, 20 Dec 2016 21:11:00 +0100 Subject: [PATCH 1/2] Add Memcached CI Signed-off-by: Roeland Jago Douma --- .drone.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.drone.yml b/.drone.yml index 821062acc9..5634c496a6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -402,6 +402,17 @@ pipeline: when: matrix: TESTS: db-codecov + memcache-memcached: + image: nextcloudci/php7.0-memcached:php7.0-memcached-6 + commands: + - service memcached restart + - ./autotest.sh sqlite tests/lib/Memcache/MemcachedTest.php + - wget https://codecov.io/bash -O codecov.sh + - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi" + - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi" + when: + matrix: + TEST: memcache-memcached matrix: include: - TESTS: signed-off-check @@ -440,6 +451,7 @@ matrix: - TESTS: carddavtester - TESTS: sqlite-php7.0-samba-native - TESTS: sqlite-php7.0-samba-non-native + - TEST: memcache-memcached - DB: NODB PHP: 5.6 - DB: NODB From 2067f7f41160d9554836595de5c205504e6d6cbc Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Tue, 20 Dec 2016 21:57:43 +0100 Subject: [PATCH 2/2] Disable memcached binary protocol Signed-off-by: Roeland Jago Douma --- lib/private/Memcache/Memcached.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/Memcache/Memcached.php b/lib/private/Memcache/Memcached.php index dbff6dc2ec..bf07fd0e6e 100644 --- a/lib/private/Memcache/Memcached.php +++ b/lib/private/Memcache/Memcached.php @@ -61,7 +61,7 @@ class Memcached extends Cache implements IMemcache { \Memcached::OPT_LIBKETAMA_COMPATIBLE => true, // Enable Binary Protocol - \Memcached::OPT_BINARY_PROTOCOL => true, + //\Memcached::OPT_BINARY_PROTOCOL => true, ]; // by default enable igbinary serializer if available if (\Memcached::HAVE_IGBINARY) {