Skip to content
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.

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

Master is now Nextcloud 21 runs on PHP 7.3 to 8.0 only #22767

Merged
merged 5 commits into from
Sep 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
136 changes: 52 additions & 84 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ steps:
commands:
- git submodule update --init
- name: checkers
image: nextcloudci/php7.2:php7.2-13
image: nextcloudci/php7.3:latest
commands:
- ./autotest-checkers.sh
secrets: [ github_token ]
Expand Down Expand Up @@ -246,10 +246,6 @@ steps:
image: docker:git
commands:
- git submodule update --init
- name: nodb-php7.2
image: nextcloudci/php7.2:latest
commands:
- NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
- name: nodb-php7.3
image: nextcloudci/php7.3:latest
commands:
Expand All @@ -258,6 +254,10 @@ steps:
image: nextcloudci/php7.4:latest
commands:
- NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
#- name: nodb-php8.0
# image: nextcloudci/php8.0:latest
# commands:
# - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite

services:
- name: cache
Expand All @@ -280,18 +280,18 @@ steps:
image: docker:git
commands:
- git submodule update --init
- name: sqlite-php7.2
image: nextcloudci/php7.2:php7.2-13
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
- name: sqlite-php7.3
image: nextcloudci/php7.3:php7.3-4
image: nextcloudci/php7.3:latest
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
- name: sqlite-php7.4
image: nextcloudci/php7.4:2
image: nextcloudci/php7.4:latest
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
#- name: sqlite-php8.0
# image: nextcloudci/php8.0:latest
# commands:
# - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite

services:
- name: cache
Expand All @@ -307,15 +307,15 @@ trigger:

---
kind: pipeline
name: mariadb10.1-php7.2
name: mariadb10.1-php7.3

steps:
- name: submodules
image: docker:git
commands:
- git submodule update --init
- name: mariadb10.1-php7.2
image: nextcloudci/php7.2:php7.2-13
- name: mariadb10.1-php7.3
image: nextcloudci/php7.3:latest
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb

Expand All @@ -342,15 +342,15 @@ trigger:

---
kind: pipeline
name: mariadb10.2-php7.2
name: mariadb10.2-php7.3

steps:
- name: submodules
image: docker:git
commands:
- git submodule update --init
- name: mariadb10.2-php7.2
image: nextcloudci/php7.2:php7.2-13
- name: mariadb10.2-php7.3
image: nextcloudci/php7.3:latest
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb

Expand All @@ -376,15 +376,15 @@ trigger:

---
kind: pipeline
name: mariadb10.3-php7.2
name: mariadb10.3-php7.3

steps:
- name: submodules
image: docker:git
commands:
- git submodule update --init
- name: mariadb10.3-php7.2
image: nextcloudci/php7.2:php7.2-13
- name: mariadb10.3-php7.3
image: nextcloudci/php7.3:latest
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb

Expand All @@ -410,17 +410,22 @@ trigger:

---
kind: pipeline
name: mariadb10.4-php7.3
name: mariadb10.4-php7.4
#name: mariadb10.4-php8.0

steps:
- name: submodules
image: docker:git
commands:
- git submodule update --init
- name: mariadb10.4-php7.3
image: nextcloudci/php7.3:php7.3-4
- name: mariadb10.4-php7.4
image: nextcloudci/php7.4:latest
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
#- name: mariadb10.4-php8.0
# image: nextcloudci/php8.0:latest
# commands:
# - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb

services:
- name: cache
Expand All @@ -445,15 +450,15 @@ trigger:

---
kind: pipeline
name: mysql8.0-php7.2
name: mysql8.0-php7.4

steps:
- name: submodules
image: docker:git
commands:
- git submodule update --init
- name: mysql-php7.2
image: nextcloudci/php7.2:php7.2-13
- name: mysql-php7.4
image: nextcloudci/php7.4:latest
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql

Expand Down Expand Up @@ -481,15 +486,15 @@ trigger:

---
kind: pipeline
name: mysql5.7-php7.2
name: mysql5.7-php7.4

steps:
- name: submodules
image: docker:git
commands:
- git submodule update --init
- name: mysql-php7.2
image: nextcloudci/php7.2:php7.2-13
- name: mysql-php7.4
image: nextcloudci/php7.4:latest
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql

Expand Down Expand Up @@ -545,15 +550,15 @@ trigger:

---
kind: pipeline
name: mysql5.6-php7.2
name: mysql5.6-php7.3

steps:
- name: submodules
image: docker:git
commands:
- git submodule update --init
- name: mysql5.6-php7.2
image: nextcloudci/php7.2:php7.2-13
- name: mysql5.6-php7.3
image: nextcloudci/php7.3:latest
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql

Expand Down Expand Up @@ -614,15 +619,15 @@ trigger:

---
kind: pipeline
name: postgres10-php7.2
name: postgres10-php7.3

steps:
- name: submodules
image: docker:git
commands:
- git submodule update --init
- name: postgres-php7.2
image: nextcloudci/php7.2:php7.2-13
- name: postgres-php7.3
image: nextcloudci/php7.3:latest
commands:
- sleep 10 # gives the database enough time to initialize
- POSTGRES=10 NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
Expand All @@ -648,15 +653,15 @@ trigger:

---
kind: pipeline
name: postgres11-php7.2
name: postgres11-php7.4

steps:
- name: submodules
image: docker:git
commands:
- git submodule update --init
- name: postgres-php7.2
image: nextcloudci/php7.2:php7.2-13
- name: postgres-php7.4
image: nextcloudci/php7.4:latest
commands:
- sleep 10 # gives the database enough time to initialize
- POSTGRES=11 NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
Expand All @@ -683,17 +688,22 @@ trigger:

---
kind: pipeline
name: mysqlmb4-php7.2
name: mysqlmb4-php7.4
#name: mysqlmb4-php8.0

steps:
- name: submodules
image: docker:git
commands:
- git submodule update --init
- name: mysqlmb4-php7.2
image: nextcloudci/php7.2:php7.2-13
- name: mysqlmb4-php7.4
image: nextcloudci/php7.4:latest
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysqlmb4
#- name: mysqlmb4-php8.0
# image: nextcloudci/php8.0:latest
# commands:
# - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysqlmb4

services:
- name: cache
Expand Down Expand Up @@ -1507,48 +1517,6 @@ trigger:
- pull_request
- push

---
kind: pipeline
name: integration-ldap-openldap-uid-features-php54-api

steps:
- name: submodules
image: docker:git
commands:
- git submodule update --init
- name: integration-ldap-openldap-uid-features
image: nextcloudci/integration-php7.2:integration-php7.2-1
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
- ./occ config:system:set redis host --value=cache
- ./occ config:system:set redis port --value=6379 --type=integer
- ./occ config:system:set redis timeout --value=0 --type=integer
- ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.local
- ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.distributed
- cd build/integration
- ./run.sh ldap_features/openldap-uid-username.feature

services:
- name: cache
image: redis
- name: openldap
image: nextcloudci/openldap:openldap-7
environment:
SLAPD_DOMAIN: nextcloud.ci
SLAPD_ORGANIZATION: Nextcloud
SLAPD_PASSWORD: admin
SLAPD_ADDITIONAL_MODULES: memberof

trigger:
branch:
- master
- stable*
event:
- pull_request
- push
type: docker

---
kind: pipeline
name: integration-ldap-openldap-uid-features
Expand Down Expand Up @@ -2276,7 +2244,7 @@ trigger:
# commands:
# - git submodule update --init
#- name: memcache-redis-cluster
# image: nextcloudci/php7.2:php7.2-13
# image: nextcloudci/php7.3:latest
# commands:
# - phpenmod xdebug
# - sleep 20
Expand Down
4 changes: 2 additions & 2 deletions apps/accessibility/appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<name>Accessibility</name>
<summary>Accessibility options for nextcloud</summary>
<description><![CDATA[Provides multiple accessibilities options to ease your use of Nextcloud]]></description>
<version>1.6.0</version>
<version>1.7.0</version>
<licence>agpl</licence>
<author>John Molakvoæ</author>
<namespace>Accessibility</namespace>
Expand All @@ -16,7 +16,7 @@
<bugs>https://github.com/nextcloud/server/issues</bugs>

<dependencies>
<nextcloud min-version="20" max-version="20"/>
<nextcloud min-version="21" max-version="21"/>
</dependencies>

<repair-steps>
Expand Down
4 changes: 2 additions & 2 deletions apps/admin_audit/appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<name>Auditing / Logging</name>
<summary>Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions.</summary>
<description>Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions.</description>
<version>1.10.0</version>
<version>1.11.0</version>
<licence>agpl</licence>
<author>Nextcloud</author>
<namespace>AdminAudit</namespace>
Expand All @@ -15,7 +15,7 @@
<category>monitoring</category>
<bugs>https://github.com/nextcloud/server/issues</bugs>
<dependencies>
<nextcloud min-version="20" max-version="20"/>
<nextcloud min-version="21" max-version="21"/>
</dependencies>
<background-jobs>
<job>OCA\AdminAudit\BackgroundJobs\Rotate</job>
Expand Down
4 changes: 2 additions & 2 deletions apps/cloud_federation_api/appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<name>Cloud Federation API</name>
<summary>Enable clouds to communicate with each other and exchange data</summary>
<description>The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data.</description>
<version>1.3.0</version>
<version>1.4.0</version>
<licence>agpl</licence>
<author>Bjoern Schiessle</author>
<namespace>CloudFederationAPI</namespace>
Expand All @@ -15,6 +15,6 @@
<category>files</category>
<bugs>https://github.com/nextcloud/cloud_federation/issues</bugs>
<dependencies>
<nextcloud min-version="20" max-version="20"/>
<nextcloud min-version="21" max-version="21"/>
</dependencies>
</info>
4 changes: 2 additions & 2 deletions apps/comments/appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<name>Comments</name>
<summary>Files app plugin to add comments to files</summary>
<description>Files app plugin to add comments to files</description>
<version>1.10.0</version>
<version>1.11.0</version>
<licence>agpl</licence>
<author>Arthur Schiwon</author>
<author>Vincent Petry</author>
Expand All @@ -17,7 +17,7 @@
<category>social</category>
<bugs>https://github.com/nextcloud/server/issues</bugs>
<dependencies>
<nextcloud min-version="20" max-version="20"/>
<nextcloud min-version="21" max-version="21"/>
</dependencies>

<activity>
Expand Down
Loading