Skip to content

PHP 7.0 CI #330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 7 commits into from
Jul 10, 2016
Merged

PHP 7.0 CI #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c91aebc
Fix phpunit Trait warning
rullzer Jul 8, 2016
58dd278
Correction is no longer required in php7
rullzer Jul 8, 2016
3e99773
Move 'main' ci to php7 (speed)
rullzer Jul 6, 2016
dbbc250
Add 5.6 sqlite ci
rullzer Jul 6, 2016
80b4efa
Disable coverage for now
rullzer Jul 6, 2016
b4e2239
Bump drone to use newer php7 docker
rullzer Jul 8, 2016
aab741e
Run mysql and posgres on 5.6
rullzer Jul 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,38 +8,41 @@ 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:
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
- ./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:
- NOCOVERAGE=true ./autotest.sh sqlite
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-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
- ./autotest.sh mysql
postgres:
- NOCOVERAGE=true ./autotest.sh mysql
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
- ./autotest.sh pgsql
- NOCOVERAGE=true ./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
Expand Down
2 changes: 1 addition & 1 deletion tests/lib/PreviewTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion tests/lib/Traits/MountProviderTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down