Skip to content
Snippets Groups Projects
Unverified Commit 4f46d654 authored by Christoph Wurst's avatar Christoph Wurst Committed by GitHub
Browse files

Merge pull request #1337 from nextcloud/enhancement/nextcloud16

Add Nextcloud 16, drop 14 support and adjust build matrix
parents 88e79644 d341463c
No related branches found
No related tags found
No related merge requests found
......@@ -29,6 +29,20 @@ env:
matrix:
- DB=sqlite
matrix:
include:
- php: 7.0
env: "DB=mysql CORE_BRANCH=master TEST_JS=TRUE"
- php: 7.1
env: "DB=mysql CORE_BRANCH=master PACKAGE=TRUE"
- php: 7.1
env: "DB=pgsql PHP_COVERAGE=TRUE"
- php: 7.0
env: "DB=pgsql CORE_BRANCH=stable15"
- php: 7.2
env: "DB=pgsql PHP_COVERAGE=v15.0.0RC1 "
fast_finish: true
branches:
only:
- master
......@@ -109,15 +123,3 @@ script:
# Upload the nightly to ftp server
- if [[ "$NIGHTLY" = "TRUE" ]]; then curl --ftp-create-dirs -T /home/travis/build/nextcloud/core/apps/mail/build/artifacts/mail.tar.gz -u $FTP_LOGIN:$FTP_PW ftp://upload.portknox.de/htdocs/mail/nextcloud_mail_nightly_build_$(date +%Y-%m-%d).tar.gz; fi
matrix:
include:
- php: 7.2
env: "DB=mysql CORE_BRANCH=stable14"
- php: 7.0
env: "DB=mysql CORE_BRANCH=master TEST_JS=TRUE"
- php: 7.1
env: "DB=mysql CORE_BRANCH=master PACKAGE=TRUE"
- php: 7.1
env: "DB=pgsql PHP_COVERAGE=TRUE"
fast_finish: true
......@@ -22,7 +22,7 @@
<screenshot>https://raw.githubusercontent.com/nextcloud/mail/74e94da16618b32ee0834e57bbfc83ff7334f709/screenshots/mail.png</screenshot>
<dependencies>
<php min-version="7.0" max-version="7.2" />
<nextcloud min-version="14" max-version="15" />
<nextcloud min-version="15" max-version="16" />
</dependencies>
<repair-steps>
<post-migration>
......
......@@ -31,7 +31,7 @@
"arthurhoaro/favicon": "^1.2"
},
"require-dev": {
"christophwurst/nextcloud": "14.0.3",
"christophwurst/nextcloud": "dev-stable15",
"christophwurst/nextcloud_testing": "0.5.1"
},
"suggest": {
......
......@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "d0cd71dec699e10b1fc411c7bc2626cf",
"content-hash": "18c72fe38d76ba0735134fa2ee2863b4",
"packages": [
{
"name": "arthurhoaro/favicon",
......@@ -884,22 +884,25 @@
"packages-dev": [
{
"name": "christophwurst/nextcloud",
"version": "v14.0.3",
"version": "dev-stable15",
"source": {
"type": "git",
"url": "https://github.com/ChristophWurst/nextcloud_composer.git",
"reference": "6988090d74635889519765b9b74bc9352e566a76"
"reference": "b9945622a4e5524f5b6bf6d651f94ff7d4d8f8d9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/ChristophWurst/nextcloud_composer/zipball/6988090d74635889519765b9b74bc9352e566a76",
"reference": "6988090d74635889519765b9b74bc9352e566a76",
"url": "https://api.github.com/repos/ChristophWurst/nextcloud_composer/zipball/b9945622a4e5524f5b6bf6d651f94ff7d4d8f8d9",
"reference": "b9945622a4e5524f5b6bf6d651f94ff7d4d8f8d9",
"shasum": ""
},
"require": {
"php": "^7.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "14.0.0-dev"
"dev-master": "15.0.0-dev"
}
},
"notification-url": "https://packagist.org/downloads/",
......@@ -913,7 +916,7 @@
}
],
"description": "Composer package containing Nextcloud's public API (classes, interfaces)",
"time": "2018-10-12T08:37:31+00:00"
"time": "2018-11-16T08:23:46+00:00"
},
{
"name": "christophwurst/nextcloud_testing",
......@@ -2537,7 +2540,8 @@
"pear-pear.horde.org/horde_text_flowed": 0,
"pear-pear.horde.org/horde_util": 0,
"pear-pear.horde.org/horde_smtp": 0,
"kwi/urllinker": 20
"kwi/urllinker": 20,
"christophwurst/nextcloud": 20
},
"prefer-stable": false,
"prefer-lowest": false,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment