From c91aebc43793f62445ac14d303b62b205980121e Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Fri, 8 Jul 2016 09:11:28 +0200 Subject: [PATCH 1/7] Fix phpunit Trait warning --- tests/lib/Traits/MountProviderTrait.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/lib/Traits/MountProviderTrait.php b/tests/lib/Traits/MountProviderTrait.php index bccb5b693ee96..0437157e84ff7 100644 --- a/tests/lib/Traits/MountProviderTrait.php +++ b/tests/lib/Traits/MountProviderTrait.php @@ -41,7 +41,7 @@ protected function registerStorageWrapper($name, $wrapper) { protected function setUpMountProviderTrait() { $this->storageFactory = new StorageFactory(); - $this->mountProvider = $this->getMock('\OCP\Files\Config\IMountProvider'); + $this->mountProvider = $this->getMockBuilder('\OCP\Files\Config\IMountProvider')->getMock(); $this->mountProvider->expects($this->any()) ->method('getMountsForUser') ->will($this->returnCallback(function (IUser $user) { From 58dd278b4ef5bcc34a3b9970c3b7ebe11b01a51c Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Fri, 8 Jul 2016 09:27:54 +0200 Subject: [PATCH 2/7] Correction is no longer required in php7 --- tests/lib/PreviewTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/lib/PreviewTest.php b/tests/lib/PreviewTest.php index 6ca88253468f0..cd22880181516 100644 --- a/tests/lib/PreviewTest.php +++ b/tests/lib/PreviewTest.php @@ -783,7 +783,7 @@ private function getSample($sampleId) { $filename = $this->samples[$sampleId]['sampleFileName']; $splitFileName = pathinfo($filename); $extension = $splitFileName['extension']; - $correction = ($extension === 'eps') ? 1 : 0; + $correction = ($extension === 'eps' && PHP_MAJOR_VERSION < 7) ? 1 : 0; $maxPreviewHeight = $this->samples[$sampleId]['maxPreviewHeight']; $maxPreviewHeight = $maxPreviewHeight - $correction; From 3e9977387ad66e64a28771c0460e4f924e907f99 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Wed, 6 Jul 2016 17:57:45 +0200 Subject: [PATCH 3/7] Move 'main' ci to php7 (speed) --- .drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 07ad955acfabb..23716f78d8d78 100644 --- a/.drone.yml +++ b/.drone.yml @@ -18,28 +18,28 @@ build: - ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database sqlite --database-pass='' - NOCOVERAGE=true ./autotest.sh sqlite sqlite: - image: nextcloudci/php5.6:1.0.6 + image: nextcloudci/php7.0:1.0.9 commands: - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - git submodule update --init - ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database sqlite --database-pass='' - ./autotest.sh sqlite mysql: - image: nextcloudci/php5.6:1.0.6 + image: nextcloudci/php7.0:1.0.9 commands: - sleep 15 # gives the database enough time to initialize - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - git submodule update --init - ./autotest.sh mysql postgres: - image: nextcloudci/php5.6:1.0.6 + image: nextcloudci/php7.0:1.0.9 commands: - sleep 10 # gives the database enough time to initialize - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - git submodule update --init - ./autotest.sh pgsql integration: - image: nextcloudci/php5.6:1.0.6 + image: nextcloudci/php7.0:1.0.9 commands: - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - git submodule update --init From dbbc25070203af09c641f25d98d8418c06d40a7a Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Wed, 6 Jul 2016 17:59:29 +0200 Subject: [PATCH 4/7] Add 5.6 sqlite ci --- .drone.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 23716f78d8d78..0bd21244ae9be 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,21 +8,24 @@ build: commands: - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - git submodule update --init - - ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database sqlite --database-pass='' - NOCOVERAGE=true ./autotest.sh sqlite sqlite-php5.5: image: nextcloudci/php5.5:1.0.7 commands: - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - git submodule update --init - - ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database sqlite --database-pass='' + - NOCOVERAGE=true ./autotest.sh sqlite + sqlite-php5.6: + image: nextcloudci/php5.6:1.0.6 + commands: + - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues + - git submodule update --init - NOCOVERAGE=true ./autotest.sh sqlite sqlite: image: nextcloudci/php7.0:1.0.9 commands: - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - git submodule update --init - - ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database sqlite --database-pass='' - ./autotest.sh sqlite mysql: image: nextcloudci/php7.0:1.0.9 From 80b4efa9e05675ba29ccf4670248ec2212feec1c Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Wed, 6 Jul 2016 19:36:57 +0200 Subject: [PATCH 5/7] Disable coverage for now Coverage generation takes to long. So disabling for now. --- .drone.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 0bd21244ae9be..93d122fa9e4af 100644 --- a/.drone.yml +++ b/.drone.yml @@ -26,21 +26,21 @@ build: commands: - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - git submodule update --init - - ./autotest.sh sqlite + - NOCOVERAGE=true ./autotest.sh sqlite mysql: image: nextcloudci/php7.0:1.0.9 commands: - sleep 15 # gives the database enough time to initialize - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - git submodule update --init - - ./autotest.sh mysql + - NOCOVERAGE=true ./autotest.sh mysql postgres: image: nextcloudci/php7.0:1.0.9 commands: - sleep 10 # gives the database enough time to initialize - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - git submodule update --init - - ./autotest.sh pgsql + - NOCOVERAGE=true ./autotest.sh pgsql integration: image: nextcloudci/php7.0:1.0.9 commands: From b4e22398d6d9f908d2b8624781081219bc7c7255 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Fri, 8 Jul 2016 15:12:36 +0200 Subject: [PATCH 6/7] Bump drone to use newer php7 docker --- .drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 93d122fa9e4af..5d8ed69b6ae0e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -22,27 +22,27 @@ build: - git submodule update --init - NOCOVERAGE=true ./autotest.sh sqlite sqlite: - image: nextcloudci/php7.0:1.0.9 + image: nextcloudci/php7.0:1.0.10 commands: - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - git submodule update --init - NOCOVERAGE=true ./autotest.sh sqlite mysql: - image: nextcloudci/php7.0:1.0.9 + image: nextcloudci/php7.0:1.0.10 commands: - sleep 15 # gives the database enough time to initialize - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - git submodule update --init - NOCOVERAGE=true ./autotest.sh mysql postgres: - image: nextcloudci/php7.0:1.0.9 + image: nextcloudci/php7.0:1.0.10 commands: - sleep 10 # gives the database enough time to initialize - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - git submodule update --init - NOCOVERAGE=true ./autotest.sh pgsql integration: - image: nextcloudci/php7.0:1.0.9 + image: nextcloudci/php7.0:1.0.10 commands: - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - git submodule update --init From aab741e4a0a0d09e73ddd2d371cf0ed18103da44 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Sat, 9 Jul 2016 20:17:01 +0200 Subject: [PATCH 7/7] Run mysql and posgres on 5.6 --- .drone.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5d8ed69b6ae0e..2b17ba42f77d7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -21,28 +21,28 @@ build: - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - git submodule update --init - NOCOVERAGE=true ./autotest.sh sqlite - sqlite: - image: nextcloudci/php7.0:1.0.10 + sqlite-php7.0: + image: nextcloudci/php7.0:1.0.9 commands: - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - git submodule update --init - NOCOVERAGE=true ./autotest.sh sqlite - mysql: - image: nextcloudci/php7.0:1.0.10 + mysql-php5.6: + image: nextcloudci/php5.6:1.0.6 commands: - sleep 15 # gives the database enough time to initialize - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - git submodule update --init - NOCOVERAGE=true ./autotest.sh mysql - postgres: - image: nextcloudci/php7.0:1.0.10 + postgres-php5.6: + image: nextcloudci/php5.6:1.0.6 commands: - sleep 10 # gives the database enough time to initialize - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - git submodule update --init - NOCOVERAGE=true ./autotest.sh pgsql integration: - image: nextcloudci/php7.0:1.0.10 + image: nextcloudci/php7.0:1.0.9 commands: - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - git submodule update --init