diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2016-08-30 19:11:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-30 19:11:16 +0200 |
| commit | d17e126330617df9c19ca593cc54d56d960a4504 (patch) | |
| tree | ee75458936615466ffb1b73735eb257012c0bdbe | |
| parent | 57f9117843afe403b8324a9e73c83c4849b3143b (diff) | |
| parent | 5e10284e34f50830000ff293384c7f602dab0e1f (diff) | |
| download | nextcloud-server-d17e126330617df9c19ca593cc54d56d960a4504.tar.gz nextcloud-server-d17e126330617df9c19ca593cc54d56d960a4504.zip | |
Merge pull request #1198 from nextcloud/php56-and-70-only
Exclude older PHP versions from .travis.yml
| -rw-r--r-- | .drone.yml | 24 | ||||
| -rw-r--r-- | .travis.yml | 14 | ||||
| -rw-r--r-- | index.php | 8 |
3 files changed, 9 insertions, 37 deletions
diff --git a/.drone.yml b/.drone.yml index 2798176c9a2..6016ebd6981 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,18 +3,6 @@ build: image: nextcloudci/jsunit:1.0.6 commands: - ./autotest-js.sh - nodb-php5.4: - image: nextcloudci/php5.4:1.0.7 - commands: - - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - - git submodule update --init - - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite - nodb-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 - - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite nodb-php5.6: image: nextcloudci/php5.6:1.0.6 commands: @@ -27,18 +15,6 @@ build: - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - git submodule update --init - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite - sqlite-php5.4: - image: nextcloudci/php5.4:1.0.7 - commands: - - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues - - git submodule update --init - - NOCOVERAGE=true TEST_SELECTION=DB ./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 - - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite sqlite-php5.6: image: nextcloudci/php5.6:1.0.6 commands: diff --git a/.travis.yml b/.travis.yml index 05b07beac3d..ddcba167af1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ sudo: false language: php php: - - 5.4 + - 5.6 env: global: @@ -41,21 +41,17 @@ matrix: include: - php: 7.0 env: TC=autoloader;TEST_DAV=0 - - php: 5.4 + - php: 5.6 env: DB=pgsql;TC=litmus-v1 - - php: 5.4 + - php: 5.6 env: DB=sqlite;TC=carddav - - php: 5.4 + - php: 5.6 env: DB=sqlite;TC=caldav - - php: 5.4 - env: DB=sqlite;TC=syntax;TEST_DAV=0 - - php: 5.5 - env: DB=sqlite;TC=syntax;TEST_DAV=0 - php: 5.6 env: DB=sqlite;TC=syntax;TEST_DAV=0 - php: 7.0 env: DB=sqlite;TC=syntax;TEST_DAV=0 - - php: 5.4 + - php: 5.6 env: DB=sqlite;TC=app:check-code;TEST_DAV=0 fast_finish: true diff --git a/index.php b/index.php index e42a0bbd7bc..8c3066d2409 100644 --- a/index.php +++ b/index.php @@ -25,10 +25,10 @@ * */ -// Show warning if a PHP version below 5.4.0 is used, this has to happen here -// because base.php will already use 5.4 syntax. -if (version_compare(PHP_VERSION, '5.4.0') === -1) { - echo 'This version of ownCloud requires at least PHP 5.4.0<br/>'; +// Show warning if a PHP version below 5.6.0 is used, this has to happen here +// because base.php will already use 5.6 syntax. +if (version_compare(PHP_VERSION, '5.6.0') === -1) { + echo 'This version of Nextcloud requires at least PHP 5.6.0<br/>'; echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.'; return; } |